Closed dzuelke closed 4 years ago
(FWIW, I'd appreciate a non-squashed merge or normal FF, since I keep my branch around and always git merge upstream/master
before edits; this time, this caused some commit duplication... I guess this happened last time because a few PRs were merged before mine?)
Sure thing! Would "create a merge commit" work for you?
Yes that works :)
https://help.github.com/en/github/administering-a-repository/about-merge-methods-on-github explains in a bit more detail why this is better for long lived branches.
Thanks!
https://devcenter.heroku.com/changelog-items/1816