Merging Commits

If a commit can't be merged directly, say because of a conflict in the release notes.

Example: User user had a PR to merge branch branch into master.

git checkout -b user-branch master
git pull git://github.com/user/pandas.git branch

Now rebase on to master (make sure to fetch upstream first), and make your changes: say fixing that conflict in release.rst

Then

git checkout master
git merge branch
git push upstream master

It should just be a fast forward merge. Don't force push. Note the merge commit hash and link to it when closing the pull request with a "Merged via "