What kind of merge commits should we use?
pdpinch opened this issue · 0 comments
pdpinch commented
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