Search found 1 match
- Mon May 25, 2015 4:40 pm
- Forum: Support (DiffMerge)
- Topic: Bug: Merge Miscatergorizes conflict as removed
- Replies: 2
- Views: 6861
Bug: Merge Miscatergorizes conflict as removed
The latest version of diffmerge miscatogorized a change as a deletion rather than a conflict, which can result in loss of code. If you open the attached git merge generated files, and scroll to the bottom, you can see that the last change in the remote version is treated as a deletion rather than gr...