L&D series: Squash commits in Pull request or Merge request (before merge)

https://flicsdb.com/wp-content/uploads/2019/03/squash.png

Learning and Development chapter 8.

10 commits is too much !!!

Well some of us may think like that and some of us is a PERFECTIONIST .

Before merge, actually we can combine those commits into a fewer commit. So, we can say a happy good bye to our Pull Request before merge into branch master.

A way to do it.

git checkout my_branch
git reset --soft HEAD~<amount>
git commit -m "my message"
git push --force origin my_branch

Another way to do it.

git rebase -i HEAD~<amount>

or

git rebase --interactive <commit-hash>

Simple, isn’t it ?!

Don’t worry, your PR/MR will still have the latest code that you’ve changed in your branch.

I don’t recommend this way after a pull request or merge request has created. But anyway it helped me a lot when I needed to test my automation in pipeline via code that had already pushed, so people not called me an idiot because so many commits I made. :D — MperMperPisang

https://remi.space/static/6546ce42aa631485470fa017bf674ddd/37523/github-squash-and-merge.png

References :

--

--

Get the Medium app

A button that says 'Download on the App Store', and if clicked it will lead you to the iOS App store
A button that says 'Get it on, Google Play', and if clicked it will lead you to the Google Play store