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

[Meta] Enable squash merging on repo #151

Closed
mpguerra opened this issue Nov 22, 2016 · 5 comments
Closed

[Meta] Enable squash merging on repo #151

mpguerra opened this issue Nov 22, 2016 · 5 comments

Comments

@mpguerra
Copy link
Contributor

Can the repo administrator enable squash merging on repo as per this article? Not sure I like how #150 is currently looking :)

@davidor
Copy link
Contributor

davidor commented Nov 22, 2016

You do not need that to improve your PR. You can do it using git. You'll need to become familiar with terms such as amend, fixup, and squash. git rebase -i can help you a lot. A tutorial like this one might help you get started: https://www.atlassian.com/git/tutorials/rewriting-history

@mpguerra
Copy link
Contributor Author

I know, but I tend to mess it up which is why I thought it would be nice and easier if we could just enable that option on the repo ;)

@mayorova
Copy link
Contributor

As I understood, this feature does squashing only at the moment of doing a merge. But I think it indeed would be useful to rebase the branch before that, before making the branch ready for review, to make it easier for the reviewer.

@andrewdavidmackenzie
Copy link
Member

rebasing to make sure the delta is the real delta versus head of master - absolutely.

But different thing from squashing to combine commits and make cleaner, no?

@jmprusi
Copy link
Contributor

jmprusi commented Nov 24, 2016

Sorry, we are not going to enable the squash merging, please rebase your branch correctly before merge (with one or more commits as needed)

@jmprusi jmprusi closed this as completed Nov 24, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

5 participants