On 09/27/2016 09:01 AM, Marius Vollmer wrote:
Github now has a "rebase and merge" button which does exactly what we
have been doing manually so far.
I think we can just use it. Differences compared to our old way are:
Yes, I agree!
I propose mentioning this again in our weekly meeting on
Monday, but the general consensus seems to be that this is a good change.
- We don't get any opportunity to add the "Reviewed-By" line, but we
can use the "Commit" field instead that is shown by "git log
--format=full" and also by Github.
- Github now says "Merged" instead of "Closed".
- It's less work.
I have closed two PRs with that button: #5079 and #5084.
I'll update our Workflow document, OK?
Thank you. We will still need the
"old way" when fixing up a pull
request or changing the commit message, but that is more an exception
than the norm.