github at its finest ^
I don’t get how this is software gore? It’s a merge conflict, a kind of common thing in Git.
“Changes can be cleanly merged” — it says at the same time.
yeah, I’ve seen this bs multiple times now. Also tired of github rewriting commits and changing hashes when they can just be fastforwrded onto the merging branch. So for a while now I almost exclusively use the command line to merge.
Would really prefer they didn’t have these buttons, if they’re not implemented correctly. Similarly, there’s a setting to uses rebases throughout the UI instead of merge commits. And it works everywhere, except when updating PR branch. It has a button “Update branch”, which does the wrong thing, with a dropdown where you can select “Rebase branch” instead. So many times, I’ve had to tell people to not click that button…
Nix 🥰
