ojacques/README.md

Created July 22, 2021 11:45

Star (0) You must be signed in to star a gist
Fork (0) You must be signed in to fork a gist

Learn more about clone URLs
Clone this repository at <script src="https://gist.github.com/ojacques/27720c4730deec230a6a684fbda3563f.js"></script>
Save ojacques/27720c4730deec230a6a684fbda3563f to your computer and use it in GitHub Desktop.

GIT: Squash commits inside a PR, before even merging

Raw

When you have a PR which has been here for some times, and master is very active, you will end up have lots of commits in your history when you get the changes from master.

To clean this up:

git fetch origin: get the latest from the repo
git checkout my_branch: go to your branch for pull request
git rebase origin/master: this will rebase the current branch with master
git push -f: force push, as we are rewriting history