mergepbx icon indicating copy to clipboard operation
mergepbx copied to clipboard

Merges by just removing files

Open JanGorman opened this issue 9 years ago • 0 comments

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

JanGorman avatar Nov 18 '15 08:11 JanGorman