[jira] [Created] (NETBEANS-3433) Allow to edit the result when resolving merge conflicts

["Lorenz Froihofer (Jira)" <ji...@apache.org>]

Lorenz Froihofer created NETBEANS-3433:
------------------------------------------

             Summary: 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


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.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