Document branch movement procedures #11279
Unanswered
bryevdv
asked this question in
Internals and design (Q&A)
Replies: 0 comments
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
-
Currently back- and forward-porting between branches is a new practice for us. I have basically been winging it, and as a result have forgotten to turn off squash merge a few times. Would like to codify the best practice in a checklist that can be followed while going through the process (that is very loud about the correct kind of merge)
It's possible there is automation that might help here too. Some possible ideas
[NO SQUASH]
automatically in the titlenosquash
label (and perhaps we can even actively prevent squash merges when the label is present)@mattpap regarding the PRs last night, I am not sure it's worth reverting and re-merging, and I don't want to force push again either. I think we just live with the slight wart on the history this time.
Beta Was this translation helpful? Give feedback.
All reactions