[
https://issues.apache.org/jira/browse/NETBEANS-544?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
ASF GitHub Bot updated NETBEANS-544:
------------------------------------
Labels: pull-request-available (was: )
> Merge conflicts resolver doesn't recognize "|||||||" conflict markers
> ---------------------------------------------------------------------
>
> Key: NETBEANS-544
> URL: https://issues.apache.org/jira/browse/NETBEANS-544
> Project: NetBeans
> Issue Type: Bug
> Components: versioncontrol - Subversion
> Reporter: Niklas Matthies
> Assignee: Aaron Ho-Means
> Priority: Major
> Labels: pull-request-available
>
> When an update creates a conflict, a merge conflict involving three versions
> of the file looks like this:
> {quote}{{<<<<<<< .mine}}
> {{lines from local file}}
> {{||||||| .r1}}
> {{lines from revision 1}}
> {{=======}}
> {{lines from revision 2}}
> {{>>>>>>> .r2}}
> {quote}
> 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.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
