Uploaded image for project: 'NetBeans'
  1. NetBeans
  2. NETBEANS-3320

Subversion visual conflict-resolution merging

    XMLWordPrintableJSON

Details

    • Bug
    • Status: Open
    • Major
    • Resolution: Unresolved
    • 11.0, 11.1
    • None
    • versioncontrol - Subversion
    • None

    • Linux Mint 64-bit; Java 11

    Description

      Conflict resolution merges from Left pane are corrupt (contain diff markers):

      ...which make it impossible to choose content from the Left side:

      Attachments

        1. after-merge.png
          23 kB
          Jose Heitor
        2. before-merge.png
          19 kB
          Jose Heitor

        Activity

          People

            Unassigned Unassigned
            joseheitor Jose Heitor
            Votes:
            0 Vote for this issue
            Watchers:
            1 Start watching this issue

            Dates

              Created:
              Updated: