[
https://issues.apache.org/jira/browse/NETBEANS-3433?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17472935#comment-17472935
]
Antonio Marques commented on NETBEANS-3433:
-------------------------------------------
I can confirm this happens with `git`. As someone who is keen to use NB's
conflict solver even for projects that have nothing to do with Java or NB, I
miss this very much. I also think it must be a regression, because I'm sure it
used to be possible to edit the result back in NB 8 (or maybe 7). With all the
upheaval caused by Java9 and the migration to Apache, I haven't said anything
about this, but now that things are stable it should be a priority - it makes
one suspect that NB developers aren't using the conflict solver at all, or
they'd run into this all the time.
> Allow to edit the result when resolving merge conflicts
> -------------------------------------------------------
>
> Key: NETBEANS-3433
> URL: https://issues.apache.org/jira/browse/NETBEANS-3433
> Project: NetBeans
> Issue Type: Improvement
> Affects Versions: 11.2
> Reporter: Lorenz Froihofer
> Priority: Major
>
> The dialog that shows up when one selects "Subversion --> Resolve
> Conflicts..." does not allow to edit the merge result. For a conflict, it is
> only possible to choose the changed part of one file or from both files.
> However, this is only sufficient for conflicts that are easy to solve. For
> larger conflicts, it is necessary to be able to edit the result directly.
> This corresponds to the following former NetBeans bugzilla bug:
> [https://netbeans.org/bugzilla/show_bug.cgi?id=141198] - but it seems the
> bugs from that former bug tracking instance have not been migrated to this
> Jira project.
> According to the following comment, this issue not restricted to Subversion
> but happens for all VCSs supported by the IDE:
> [https://netbeans.org/bugzilla/show_bug.cgi?id=141198#c1]
> There is a workaround to this topic as one can select two of the temporary
> files created by Subversion during an update and use "Tools --> Diff...".
> This brings up a merge dialog where one side can be edited and the result
> copied back to the main file. However, it is surprising that this issue is
> still open in 2019 as it is a core feature of an IDE and I am not aware of
> any other IDE that has such a restriction in resolving conflicts.
--
This message was sent by Atlassian Jira
(v8.20.1#820001)
---------------------------------------------------------------------
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
