Menu
I have a master branch that is the production branch and so I create several other branches for fixes and defects. I make several changes in those branches and so I commit many times in those branches. As per the policy, I have to create a single commit for a defect in the master branch for a fix but when I merge my changes to master branch all the commits are also merged and so is reflected in the history.
I want to know if there is an option in VSCode to squash merge to the master branch from my defect branch, so I can just create a single commit in the master branch and push. I know how to do it in git bash but is there an alternative in VScode that I am not aware of?
480
To squash commits into one we just have to select them, right click and select the Squash Commits menu. and now give a meaningful name to the single merged commit and press Squash button.
You can choose to squash merge when completing a pull request in Azure Repos. Choose Squash commit under Merge type in the Complete pull request dialog to squash merge the topic branch.
git config --global merge.tool vscode git config --global mergetool.vscode.cmd 'code --wait $MERGED' This adds the following settings to your global Git config: [merge] tool = vscode [mergetool "vscode"] cmd = code --wait $MERGED You can paste this in yourself if you prefer.
If you are looking to squash several commits into one in VS Code without having to use the console, I have a solution for you. First off you need the GitGraph plugin, which simply allows you to see the full git log history of your branches. This is handy when having to interact with specific commits, which we will do if we want to squash them.
macOS: Select Shell Command: Install 'Code' command in path from the Command Palette. Linux: Make sure you installed VS Code via a .deb or .rpm package. The default Git Editor is Nano. This is how Nano looks for a commit message. This is how VS Code looks for a commit message. To update your git configuration, run the following command:
Instantly share code, notes, and snippets. With the introduction of GitHub's Squash and Merge feature, this has become less prevelant, however it's still useful in scenarios where GitHub's interface is unavailable. Let's talk through two ways to do a squash and merge on the command line.
The git graph extension has this feature - 
The recording above assumes that the current checked-out branch is the branch you want to merge into (e.g. in the recording that branch is called master), and the branch that we want to merge is the branch that gets right-clicked (e.g. in the recording that branch is called fix_branch).
Since this is a squash merge, the fix_branch doesn't really get merged into master, a single squash-merge commit gets created on top of master. This new commit has just the previous commit marked as a parent, rather than the usual 2-parent commit that we get in regular non-squash merges.
81
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
