2 ms·
You can set on the repository if you want it to rebase instead[0] [0]: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/incorporating-
by no_wizard 5y ago
You can set on the repository if you want it to rebase instead[0]
[0]: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges https://docs.github.com/en/pull-requests/collaborating-with-...
- benatkin 5y agoI know about that but don't know if it works for updating a branch before merging it. I'll have to try changing it to that setting.
- tomn 5y agoAnnoyingly this always re-writes commits (i.e. never fast-forwards), which means that if you have branches based on the branch you're merging they will need to be rebased, and git will complain about deleting the branch because it looks like it's unmerged.