How @mvollmer merges pull requests

Marius Vollmer edited this page Jan 13, 2015 · 1 revision

I often merge multiple pull requests in one go, if they are simple enough.

  • I rebase the commits of each pull request onto master, by cherry picking them one by one from the branch of the pull request.

  • For each cherry picked commit:

    • I run make check-memory. (Not always, I have to admit.)

    • I add the Reviewed-by and Closes lines (as appropriate) by amending the commit.

  • Once they are all on my local master, I run ./testsuite-prepare and ./check-verify. I rerun individual failed tests to see whether that helps.

  • When I am happy with ./check-verify, I push my local master to the main repo.

Clone this wiki locally
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.
Press h to open a hovercard with more details.