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

What kind of merge commits should we use? #34

Open
pdpinch opened this issue Oct 10, 2019 · 0 comments
Open

What kind of merge commits should we use? #34

pdpinch opened this issue Oct 10, 2019 · 0 comments

Comments

@pdpinch
Copy link
Member

pdpinch commented Oct 10, 2019

from https://mitodl.slack.com/archives/GG8B4C3JP/p1570715139029700

looks like in the case of hot fixes, we want to be sure we use the "rebase and merge" option under the merge button on github. It's probably good habit to just always use it to avoid the merge commits anyway, but I don't think github defaults to that unfortunately

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

1 participant