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

Squash and merge #1339

Closed
wwwdata opened this issue Nov 15, 2016 · 3 comments
Closed

Squash and merge #1339

wwwdata opened this issue Nov 15, 2016 · 3 comments
Labels

Comments

@wwwdata
Copy link

@wwwdata wwwdata commented Nov 15, 2016

How to do the new Squash and merge workflow with hub? I always have the problem that I want to use my company email address when doing operations on github, that's why I cannot use the web-ui, like ever, because that always uses my primary email address. It cannot be changed.

But that is no problem, because merging works with hub. But how to do the new Squash and merge feature? When I merge with git merge <url> --squash --no-ff, I can create one squashed commit, but when just pushing that back to github, the PR doesn't close and registers my new commit as the squashed merged commit. Another benefit of this would be that it's possible to also gpg sign the squashed commit.

@mislav

This comment has been minimized.

Copy link
Member

@mislav mislav commented Nov 16, 2016

There is no built in way with hub, sorry! But there's an easy workaround: do hub merge --squash <url> and when committing, add the phrase Closes #42 with the number of the PR that you just squashed.

Merge and squash/merge and rebase are very recent additions to GitHub web UI and I'm still figuring out how to best support their equivalents through hub. If you have any suggestions, I'm all ears!

@pgrm

This comment has been minimized.

Copy link

@pgrm pgrm commented Mar 16, 2017

I though you're using GitHub's API to perform most of the actions, and they do have now a parameter for the merge_method: https://developer.github.com/v3/pulls/#merge-a-pull-request-merge-button - wouldn't that work, or am I missing something?

@mislav

This comment has been minimized.

Copy link
Member

@mislav mislav commented Jan 26, 2019

See the resolution in #1483 (comment)

@mislav mislav closed this Jan 26, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked pull requests

Successfully merging a pull request may close this issue.

None yet
3 participants
You can’t perform that action at this time.