[NETBEANS-544] Merge conflicts resolver doesn't recognize "|||||||" conflict markers

• Type: Bug
• Status: Closed
• Priority: Major
• Resolution: Fixed
• Fix Version/s: 11.2
• Component/s: versioncontrol - Subversion
• Labels: pull-request-available
• Assignee: Aaron Ho-Means
• Reporter: Niklas Matthies
• Created: 29/Mar/18 03:18
• Updated: 05/Feb/21 21:11
• Resolved: 02/Jan/21 19:44

Description

When an update creates a conflict, a merge conflict involving three versions of the file looks like this:

<<<<<<< .mine
lines from local file
||||||| .r1
lines from revision 1
=======
lines from revision 2
>>>>>>> .r2

The Merge Conflicts Resolver (menu Team > Resolve Conflicts...) does not recognize "|||||||" lines and doesn't filter them out in the "Local Working File" pane. When accepting the local version, the "|||||||" lines therefore end up in the merged result, as shown in the "Result after merge" pane, and also in the actual file after saving. They have to be removed manually then, or may remain unnoticed and be accidentally commited.

I only tested this with the JavaHL subversion client so far, but suspect that this bug is independent of the client.

Issue Links

• is duplicated by: NETBEANS-546 Resolve Conflict
• links to: GitHub Pull Request #1333