3-way merge fallback marks a file as resolved, even if there are still merge conflicts

simonwagner / mergepbx

script for merging XCode project files in git

GNU General Public License v3.0

1.04k stars 46 forks source link

3-way merge fallback marks a file as resolved, even if there are still merge conflicts #30

Open fabb opened 6 years ago

fabb commented 6 years ago

since #22, if there are merge conflicts that cannot be resolved by the 3-way text merge, the conflict markers stay in the file (good), but the file gets marked as resolved (bad). the latter results in merge tools not recognizing the file as in conflict, and not being able to assist in resolving the conflicts.