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

Pass --allow-unrelated-histories to git merge if git version >= 2.9 where it is needed. #102

Open
wants to merge 2 commits into
base: master
from

Conversation

Projects
None yet
1 participant
@yarlB
Copy link

commented May 5, 2018

While I was playing with checkout to try to update src-netbsd, git merge failed.
https://github.com/git/git/blob/master/Documentation/RelNotes/2.9.0.txt#L58-L68

@yarlB yarlB changed the title Pass --allow-unrelated_histories to git merge if git version >= 2.9 where it is needed. Pass --allow-unrelated-histories to git merge if git version >= 2.9 where it is needed. May 5, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.