update CONTRIBUTING.md on how to fix git commits to have a clean history #1164
Conversation
| git branch -D development | ||
| git checkout -b development upstream/development |
There was a problem hiding this comment.
The parts around look good, but why do we pro-actively recommend to remove and re-check out the local development branch? :)
There was a problem hiding this comment.
In my observation of PRs with dozens of already merged commits but only one real commit, the root cause is almost always development branch being diverged. Yes, it's not necessary in some situations, but people who are in those usually do not need the instructions here.
There was a problem hiding this comment.
I see. Just wondering because if you show them how to rebase against the remote development branch it does not matter what the status of the local development branch is.
One could potentially split the 2nd part with that rationale in a smaller chunk after that, just to make it appear less magic to the reader.
Co-authored-by: Axel Huebl <axel.huebl@plasma.ninja>
…ory (AMReX-Codes#1164) * update CONTRIBUTING.md on how to fix git commits to have a clean history Co-authored-by: Axel Huebl <axel.huebl@plasma.ninja>
No description provided.