search

ukgovdatascience / rap_companion

A technical communication document intended to give assistance to people developing a Reproducible Analytical Pipeline.
https://ukgovdatascience.github.io/rap_companion
GNU General Public License v3.0
47 stars 3 forks source link

No longer need to squash before push #98

Open nacnudus opened 5 years ago

nacnudus commented 5 years ago

The companion advises to squash before pushing, but these days you can click "Squash and merge" in GitHub, which is better because it preserves the conversation.

https://github.com/ukgovdatascience/rap_companion/blob/da7079747407115d749848fede72e083bbc27ba3/06-version_control.Rmd#L66

matt-dray commented 5 years ago

This is relevant to #54

ivyleavedtoadflax commented 5 years ago

This is also worth a read when considering rebase vs merge: https://medium.com/@fredrikmorken/why-you-should-stop-using-git-rebase-5552bee4fed1.

In general I think it is simpler if you suggest sticking to the golden rule of never rewrite your history when introducing people to git. You may end up with an untidy(ier) git history, but at least everyone will be on the same commit. On that note: https://github.com/git-chglog/git-chglog this is also worth a look, but may not play well with windows.