Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merges by just removing files #17

Open
JanGorman opened this issue Nov 18, 2015 · 0 comments
Open

Merges by just removing files #17

JanGorman opened this issue Nov 18, 2015 · 0 comments

Comments

@JanGorman
Copy link

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant