#Sublime merge squash commits how to#
#Sublime merge squash commits code#

To merge the new-feature branch to main and squash the commits there, I’ll use the git merge command with the -squash flag: git merge -squash new-feature Now, to do the squashing with the git merge command, I’m going to switch to the main branch by running git switch main. I pushed the branch to GitHub again, so I can see those commits there too: To do this, I’m going to undo the squashing I did in the last step by running git reset -hard git log -oneline again, I can see all the commits once more: The downside of this approach is that you don’t have much control as you do with rebase. This helps clean up the incoming branch of redundant commits. You can also combine multiple commits into one when you’re about to merge branches.

#Sublime merge squash commits how to#

How to Squash Commits in Git with the merge Command and -squash Flag If you push your branch to Git, you'll see one commit message too: Remember that the new commit message is 'Ready to deploy'. If you add a new commit message, save the file and close it.Īfter doing that, you should see a success message in the terminal.Ĭheck your Git log again by running git log -oneline and you should see all the commits have been combined: You can get rid of all of them and add your custom message: Git will open up another editor where you can see the new commit message it generates for you: The first commit is the one you will combine them into without losing your changes.Īfter doing that, save the file and close it. Note: pick or p will only use those commits, but squash or s will use them and combine them all together.

Now, you need to replace all those pick with squash (or simply s) apart from the first one.

The default is Vim, but in my case, it is VS Code.

This will open up your editor of choice for Git. To do that run this command: git rebase -i HEAD~6 So if you want to squash all those commits in the new-feature branch together, you need to go back 6 commits. The first thing you need to do is to tell Git how far back you want to rebase. I could see those commits because I ran the command git log -oneline. I want to squash all the commits in the new-feature branch into one commit. Note that I have two branches – main and new-feature. I have these commits I would like to combine into one: Apart from squashing, the command also allows you to drop commits, reword commit messages, and add new files. In this process, you will grab all the commits with the git rebase command with the i flag and put them together with squash. How to Squash Commits in Git with Interactive Rebase In this article, I’ll show you how commit squashing works in Git so you can combine several messy or unecessary commits into one commit without losing your changes. While doing this, things might get messy because you now have several commits, even for things that aren’t necessary.īecause of this, you might want to combine all those commits into a single commit.

#Sublime merge squash commits code#

This lets you see how the code works or looks. If you are working on a project and trying to implement a new feature, you might commit your code a few times to test things out.