Hacker News Reader

GitHub's button to update the current branch annoys me. It creates a merge commit back from the main branch to the feature branch. I would rather it back up the current branch and rebase it or something, or just let me do it the right way manually (rebase and force push).

View on HN

You can set on the repository if you want it to rebase instead[0]

[0]: https://docs.github.com/en/pull-requests/collaborating-with-...

I 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.

Annoyingly 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.

Reply on news.ycombinator.com