You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
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
The text was updated successfully, but these errors were encountered:
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
The text was updated successfully, but these errors were encountered: