You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by "Tomáš Procházka (Jira)" <ji...@apache.org> on 2021/01/02 19:45:00 UTC
[jira] [Resolved] (NETBEANS-544) Merge conflicts resolver doesn't
recognize "|||||||" conflict markers
[ https://issues.apache.org/jira/browse/NETBEANS-544?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]
Tomáš Procházka resolved NETBEANS-544.
--------------------------------------
Fix Version/s: 11.2
Resolution: Fixed
Fix was merged.
> 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
> Fix For: 11.2
>
> Time Spent: 0.5h
> Remaining Estimate: 0h
>
> 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
(v8.3.4#803005)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists