Join GitHub today
GitHub is home to over 28 million developers working together to host and review code, manage projects, and build software together.Sign up
Fix revdep_check() when git2r is not loaded #1068
added a commit
this pull request
Feb 11, 2016
Nope: I have put together a test script that simulates adding a bullet point to the top of the NEWS file, a merge conflict is raised when trying to merge the second branch. Using .gitattributes helps, but only locally, not on GitHub.
In my code, I record the NEWS entries in the bodies of the merge commit messages. Then, just before release, I use