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.

Sign up for GitHub

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

Jump to bottom

Spurious merge conflicts. #4

Open

MrJoy opened this issue Oct 21, 2016 · 1 comment

MrJoy commented Oct 21, 2016

A couple options come to mind:

Try using git commit --allow-empty, with no actual content changes to avoid spurious merge conflicts.
- You may need to configure the repo to prevent rebasing though as by default git rebase kvetches about empty commits.
- You could also do a git fetch then a git rebase --keep-empty to get around the problems there of course, but that seems.
Use git fetch followed by git merge --strategy=ours.

The text was updated successfully, but these errors were encountered:

Owner

staab commented Oct 24, 2016

I don't really intend to maintain this repo, but that stuff is helpful, thanks.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment