Skip to content
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

Merge strategy "Squash and merge" at project level #68

Closed
patrickceg opened this issue Jun 23, 2019 · 7 comments
Closed

Merge strategy "Squash and merge" at project level #68

patrickceg opened this issue Jun 23, 2019 · 7 comments
Labels
repo A task specifically related to the project repository

Comments

@patrickceg
Copy link
Contributor

patrickceg commented Jun 23, 2019

Is your feature request related to a problem? Please describe.
There was a comment made on pull request #57 about merge strategy being "squash" we should allow the tooling (Github) handle that so we don't need waste time on comments like that.

The comment - #57 (comment)

Describe the solution you'd like
Set the project to enforce merge strategy upon merge of pull requests

@kingthorin kingthorin added the repo A task specifically related to the project repository label Jun 23, 2019
@caperutxa
Copy link

I do not like squash strategy for merges.

Squash remove the commit history in benefit to merge in order to obtain a single view to a group of commits but there are ways to see all changes in a group of commits, between tags... and the history commits is not lost

@kingthorin
Copy link
Collaborator

IMHO the user's feature branch (for lack of a better term) commit history is irrelevant to the overall project. But that's just my 2 cents.

@ThunderSon
Copy link
Collaborator

I'd mainly recommend the usage of squash strategy when a lot of bad commits have been committed to a PR. Otherwise, the commits are needed to re-track the changes if need be, instead of having it all in one commit.

@ThunderSon
Copy link
Collaborator

@kingthorin Moving forward, let's set it to Squash and Merge, and when need be, the reviewer can manually take in all commits. Sounds good?

@kingthorin
Copy link
Collaborator

kingthorin commented Jul 21, 2019

Seems fine to me, but it’s not something I can set.

As things are people can use the drop down on the merge button. (It seems to stick with whichever method was most recently used, until changed again.)

@patrickceg
Copy link
Contributor Author

Should we close this issue? We've been through a whole month of awesome contributions and I don't think this was ever a problem.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
repo A task specifically related to the project repository
Projects
None yet
Development

No branches or pull requests

4 participants