Merges by just removing files

simonwagner / mergepbx

script for merging XCode project files in git

GNU General Public License v3.0

1.04k stars 46 forks source link

Merges by just removing files #17

Open JanGorman opened 8 years ago

JanGorman commented 8 years ago

Hi,

I have mergepbx setup as a merge driver (reference in .gitconfig and .gitattributes) but whenever I merge two branches all it seems to do is remove references to files from the project that would result in a merge conflict leaving me to add them back by hand. That can't be the intended usage, right?

Thanks Jan