Hi,
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:
- 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?
On 09/27/2016 09:01 AM, Marius Vollmer wrote:
Hi,
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.
-Dominik
On 28.09.2016 20:39, 'Dominik Perpeet' wrote:
On 09/27/2016 09:01 AM, Marius Vollmer wrote:
Hi,
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.
I think having the actual 'approve' signoff in github would be appropriate. We still need someone to stamp and explicitly say they approved this ... and I don't think the 'Commit' git field is enough to indicate that.
However there's now an approve option in the new GitHub review flow. So I that might cover this nicely.
Stef
cockpit-devel@lists.fedorahosted.org
-
'Dominik Perpeet' -
Marius Vollmer -
Stef Walter