merging cleanly when using GitHub PR workflow

[btc]

If there are multiple open PRs and one is merged, the remaining PRs fall behind master and create hard-to-bisect, overlapping merges.

I'm happy to perform merges locally so they apply cleanly, but I am sensitive to the extra work that a "merge-locally" policy creates. Thoughts?

https://gist.github.com/jbenet/ee6c9ac48068889b0912

[whyrusleeping]

Agreed. this is something we should work towards making sure we do, although rebasing on top of master again can be obnoxious sometimes (having to resolve a merge conflict for each commit in your branch)

[jbenet]

the trick i (try to) do is rebase constantly on top of master, so you keep abreast of new changes and address conflicts incrementally while those modules still in your memory.

rebasing isn't perfect, but i find it less confusing than merges in all directions.