Details
-
Type:
Story
-
Status: Done
-
Resolution: Done
-
Fix Version/s: None
-
Component/s: Documentation
-
Labels:
-
Story Points:0.5
-
Team:Architecture
Description
The section in the developer guide about Merging still discourages devs from using the "big green button" on github. That's out of date now: it's probably better to use it, because you'll be sure that you're rebased against master and travis completed. I don't know that we have any repositories for which it's not safe to use: if so, we could either document them, or list the conditions under which we shouldn't use it.
Please update that paragraph to reflect this.
Attachments
Activity
Given the recent problem of no tests being run for DM-23490, and it not being merged properly (relevant here), can we please get the dev guide updated to reflect the above?
I think we can close this? Although making the "don't use Update my branch" more prominent might be good.
Yes, I did a pass confirming proper checks were in place when we changed the default branch, and new templates with sqrbot-jr should also help.
I think the ultimate solution to this is going to be an automated repo checker that ensures that the appropriate branch protection and Travis checks are enabled, at which point we can be confident that the green button will always work. I believe the GitHub API has methods for this.