New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Squash merges from UI #406

Closed
jantman opened this Issue Jun 11, 2015 · 6 comments

Comments

Projects
None yet
6 participants
@jantman

jantman commented Jun 11, 2015

Similar to #88 but more pointed...

A lot of projects on GitHub request that PRs are squashed down to one commit, mainly to keep a clean history. This poses a number of problems:

  1. I've seen quite a few PRs submitted by casual contributors that forgot to do this, or never made the requested changes. When this happens, the level of effort for maintainers is quite high - pull the contributor's work into a branch of their own, then squash it all down, then open a new PR and close the old one (which may well have valuable commentary in it).
  2. Unless the contributor cuts a new branch with the squash and then changes the PR to use that new branch, the commit history is effectively lost.
  3. This is essentially saying "don't work the way GitHub lets you."

It would be much more helpful if PRs offered this option, i.e. "Squash Merge". It would perform a merge --squash, but allow leaving the source branch intact. Ideally, the person who merges would be able to specify the commit message, which would default to "{title} (PR {num})" where title is the title of the PR, and num is the PR number. This would allow quick reference to the original pull request (and commit history).

@cirosantilli

This comment has been minimized.

Show comment
Hide comment
@sparrc

This comment has been minimized.

Show comment
Hide comment
@sparrc

sparrc commented Sep 28, 2015

+1

@edouard-lopez

This comment has been minimized.

Show comment
Hide comment
@edouard-lopez

edouard-lopez commented Jan 20, 2016

+1

@beckclib

This comment has been minimized.

Show comment
Hide comment
@beckclib

beckclib Jan 25, 2016

A lot of projects on GitHub request that PRs are squashed down to one commit, mainly to keep a clean history.

Ditto. Often git pull --rebase needs to be done too.

+5

beckclib commented Jan 25, 2016

A lot of projects on GitHub request that PRs are squashed down to one commit, mainly to keep a clean history.

Ditto. Often git pull --rebase needs to be done too.

+5

@cirosantilli

This comment has been minimized.

Show comment
Hide comment
Collaborator

cirosantilli commented Apr 2, 2016

@necrose99

This comment has been minimized.

Show comment
Hide comment
@necrose99

necrose99 May 3, 2018

I'd be happy with a Conslidate today's commits or last FEW Minor commits... 10am---5pm now smash@5pm

namily docker can be trial and error with gentoo , emerge fob/booby ... deps is not installed it wines..
fix , ok working ..... broken ... so get mad and hammer out commits , fixes 1 by 1 quay.io building FINALLY ... however be nice to smash the last few typo fixes etc into fewer commits.
however the docker image for building will do just fine... as far as keep on keeping on , package updating etc.. just trying to unbork 100 commits to just a few or consolidate out a plus.

necrose99 commented May 3, 2018

I'd be happy with a Conslidate today's commits or last FEW Minor commits... 10am---5pm now smash@5pm

namily docker can be trial and error with gentoo , emerge fob/booby ... deps is not installed it wines..
fix , ok working ..... broken ... so get mad and hammer out commits , fixes 1 by 1 quay.io building FINALLY ... however be nice to smash the last few typo fixes etc into fewer commits.
however the docker image for building will do just fine... as far as keep on keeping on , package updating etc.. just trying to unbork 100 commits to just a few or consolidate out a plus.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment