Join GitHub today
GitHub is home to over 36 million developers working together to host and review code, manage projects, and build software together.Sign up
Pass --allow-unrelated-histories to git merge if git version >= 2.9 where it is needed. #102
While I was playing with checkout to try to update src-netbsd, git merge failed.