Stuck on an issue?

Lightrun Answers was designed to reduce the constant googling that comes with debugging 3rd party libraries. It collects links to all the places you might be looking at while hunting down a tough bug.

And, if you’re still stuck at the end, we’re happy to hop on a call to see how we can help out.

Squash option when merging a branch

See original GitHub issue

Hi,

When we merge a branch (Branch / Merge Into Current Branch...), would be nice to have an option to squash (git merge --squash).

A simple option squash to tick would be perfect, internally it would then simply add --squash to the git command.

Many thanks for your support 👍

Ben

Issue Analytics

State:
Created 6 years ago
Reactions:90
Comments:26 (7 by maintainers)

Top GitHub Comments

23reactions

usmcmckeecommented, Mar 12, 2021

Now March 12th 2021 almost 4 years later. Is the squash feature request going to be added to the roadmap?

10reactions

billygriffincommented, May 5, 2021

Hi folks, we’re starting to look at this so I’m going to reopen this issue. For merging, I think we’ll likely do something similar to what we did with rebasing, where it’s a separate path instead of taking over the existing merge path. We’re also hoping to implement something to allow you to squash commits on a particular branch outside the context of a merge. If you’ve 👍 on this issue and wouldn’t mind sharing your use cases for when you’re squashing, that would be really helpful! We may also reach out here and ask for feedback and/or usability testing participants once we’ve shipped an initial iteration to beta. Thanks!

Top Results From Across the Web

How can I merge multiple commits onto another branch as a ...

git merge --squash allows you to create a single commit on top of the current branch whose effect is the same as merging...

Squash and merge - GitLab Docs

Small commits are joined together, making it simpler to revert all parts of a change. When the single commit merges into the target...

How to Squash Commits in Git | Learn Version Control with Git

When integrating commits from one branch into another, the 'squash' option allows you to combine multiple commits into one.

Configuring commit squashing for pull requests - GitHub Docs

Under "Pull Requests", select Allow squash merging. This allows contributors to merge a pull request by squashing all commits into a single commit....

What is the difference between a merge commit & a squash?

A squash merge is meant to simplify and summarize the commits that have taken place in your feature branch, yet the operation itself...