How to use git merge --squash

Question

I have a remote Git server  here is the scenario which I want to perform    For each bug feature I create a different Git branch I keep on committing my code in that Git branch with un-official Git messages In top repository we have to do one commit for one bug with official Git message   So how can I merge my branch to remote branch so that they get just one commit for all my check-ins  I even want to provide commit message for this

User · Answer

I know this question isn t about Github specifically  but since Github is so widely used and this is the answer I was looking for  I ll share it here   Github has the ability to perform squash merges  depending on the merge options enabled for the repository   If squash merges are enabled  the  Squash and merge  option should appear in the dropdown under the  Merge  button

User · Answer

Your feature branch is done and ready to commit to master  develop or other target branch with only one commit  Go to merge branch   git checkout master  amp  amp  git pull Create a work branch from your clean local master   git checkout -b work Merge squash your feature branch on work   git merge --squash your feature branch  Commit with default or a new message   git commit   with a specific or default message  Go back to your feature branch   git checkout  your feature branch Point your feature branch to work dir   git reset --hard work Verify but you are ready to push   git push -f Then clean up work branch if needed  Replace master with your target branch   develop and so on  No need to specify how many commit from your master to your feature branch  Git takes care

User · Answer

Assume the name of the branch where you made multiple commits is called bugfix 123  and you want to squash these commits  First  create a new branch from develop  or whatever the name of your repo is   Assume the name of the new branch is called bugfix 123 up  Checkout this branch in git bash -  git fetch git checkout bugfix 123 up git merge bugfix 123 --squash git commit -m  quot your message quot  git push origin bugfix 123 up  Now this branch will have only one commit with all your changes in it

User · Answer

git checkout YOUR RELEASE BRANCH git pull git checkout -b A NEW BRANCH git merge --squash YOUR BRANCH WITH MULTIPLE COMMITS git commit -am  quot squashing all commits into one quot  git push --set-upstream origin A NEW BRANCH

User · Answer

To squash your local branch before pushing it    checkout the branch in question to work on if it is not      already checked out  Find the sha of the oldest commit you wish to keep  Create checkout a new branch  tmp1  from that commit   git checkout -b tmp1  lt sha1-of-commit gt  Merge the original branch into the new one squashing   git merge --squash  lt original branch gt  Commit the changes which have been created by the merge  with a summary commit message   git commit -m  lt msg gt  Checkout the original branch you want to squash   git checkout  lt branch gt  Reset to the original commit sha you wish to keep   git reset --soft  lt sha1 gt    Rebase this branch based on the new tmp1 branch   git rebase tmp1 That s it - now delete the temporary tmp1 branch once you re sure everything is ok

User · Answer

Merge newFeature branch into master with a custom commit   git merge --squash newFeature  amp  amp  git commit -m  Your custom commit message     If instead  you do  git merge --squash newFeature  amp  amp  git commit  you will get a commit message that will include all the newFeature branch commits  which you can customize   I explain it thoroughly here  https   youtu be FQNAIacelT4

User · Answer

Say your bug fix branch is called bugfix and you want to merge it into master  git checkout master git merge --squash bugfix git commit  This will take all the commits from the bugfix branch  squash them into 1 commit  and merge it with your master branch   Explanation  git checkout master  Switches to your master branch  git merge --squash bugfix  Takes all commits from the bugfix branch and groups it for a 1 commit with your current branch   no merge commit appears  you could resolve conflicts manually before following commit  git commit  Creates a single commit from the merged changes  Omitting the -m parameter lets you modify a draft commit message containing every message from your squashed commits before finalizing your commit

User · Answer

For Git  Create a new feature  via Terminal Shell   git checkout origin feature  lt featurename gt  git merge --squash origin feature  lt featurename gt    This doesnt commit it  allows you to review it first   Then commit  and finish feature from this new branch  and delete ignore the old one  the one you did dev on

User · Answer

Suppose you worked in feature task1 with multiple commits    Go to your project branch  project my project   git checkout project my project  Create a new branch  feature task1 bugfix   git checkout -b feature task1 bugfix  Marge with the --squash option  git merge --squash feature task1  Create a single commit  git commit -am  add single comments   Push your branch  git push --set-upstream origin feature task1 bugfix

User · Answer

What finally cleared this up for me was a comment showing that   git checkout main git merge --squash feature   is the equivalent of doing   git checkout feature git diff main  gt  feature patch git checkout main patch -p1  lt  feature patch git add     When I want to merge a feature branch with 105     commits and have them all squashed into one  I don t want to git rebase -i origin master because I need to separately resolve merge conflicts for each of the intermediate commits  or at least the ones which git can t figure out itself   Using git merge --squash gets me the result I want  of a single commit for merging an entire feature branch  And  I only need to do at most one manual conflict resolution

User · Answer

Use git status   to check what s going on  Then git checkout master  git merge --squash bugfix git add  add which files you want or use wildcard command like  quot   quot    Then git commit -m  quot message quot   And now last but not the least git push -u origin master  Here origin can be other remote you prefer

User · Answer

If you have already git merge bugfix on main  you can squash your merge commit into one with   git reset --soft HEAD 1 git commit

User · Answer

You want to merge with the squash option  That s if you want to do it one branch at a time   git merge --squash feature1   If you want to merge all the branches at the same time as single commits  then first rebase interactively and squash each feature then octopus merge    git checkout feature1 git rebase -i master   Squash into one commit then repeat for the other features   git checkout master git merge feature1 feature2 feature3       That last merge is an  octopus merge  because it s merging a lot of branches at once    Hope this helps

User · Answer

You can use tool I ve created to make this process easier  git-squash  For example to squash all commits on feature branch that has been branched from master branch  write   git squash master git push --force

User · Answer

if you get error  Committing is not possible because you have unmerged files   git checkout master git merge --squash bugfix git add   git commit -m  Message    fixed all the Conflict files   git add      you could also use   git add  filename

[git] How to use git merge --squash?

Examples related to git

Examples related to git-merge

Examples related to git-squash