It would be useful if we could be able to add both conflict code instead
just one of the two. It happens to me when i added a new method in a
and someone else added a different method in the same file and line.
wanted to add both changes but i was unable to do it with the
conflicts ui ( or maybe i missed something ? )
Set target milestone to TBD
Is this really useful to have this implemented?
*** Issue 65783 has been marked as a duplicate of this issue. ***
Just to indicate that it's the same with NB5.0 (see issue marked as duplicate of
this one). And would be enhanced.
IMHO, it could be planned for after release of 5.0. But would be nice if it was
available at the same time of the release of support for SubVersion.
*** Issue 66019 has been marked as a duplicate of this issue. ***
*** Issue 128168 has been marked as a duplicate of this issue. ***
*** Issue 65051 has been marked as a duplicate of this issue. ***
*** Issue 76682 has been marked as a duplicate of this issue. ***
When using git/distributed version control you encounter the situation more often that you need
a) add both sides and/or
b) manually re-edit the merge
Please support that use case!
- remember what you damaged when merging (loosing one side)
- manually change it afterwards
- save everything and commit again
Duplicate of #141198
"manually re-edit the merge"
Regarding https://netbeans.org/bugzilla/show_bug.cgi?id=141198#c5 https://netbeans.org/bugzilla/show_bug.cgi?id=212811 would be the solution
*** This bug has been marked as a duplicate of bug 141198 ***