Sometimes I need to merge squash from Eclipse. I know I can do it in command line, but it will be really useful to have graphic option integrated in Eclipse. Do you know how to do it?
Under your repository name, click Settings. Under "Pull Requests", select Allow squash merging. This allows contributors to merge a pull request by squashing all commits into a single commit.
Set default squash options for a merge request Users with permission to create or edit a merge request can set the default squash options for a merge request. To do this: Go to the merge request and select Edit. Select or clear the Squash commits when merge request is accepted checkbox.
In case you are using the Tower Git client, using Interactive Rebase to squash some commits is very simple: just select the commits you want to combine, right-click any of them, and select the "Squash Revisions..." option from the contextual menu.
You can start an interactive rebase in EGit, and select squash for the commits you want squashed.
Note: for squashing the last few commits, historically the other way was a soft reset (see this thread)
- select in history the first commit which I don't want to squash
- right-click and say "
Team->Reset->Soft
"- right-click and say "
Commit
". This commit will contain all the changes of the last m commits together
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