Git Rebase Explained: A Straight Line Instead of a Merge Commit
The branch has one commit sitting beside main's two commits. Now the rebase, from the feature branch: Now the part the tidy tutorials skip: something goes wrong. Both branches changed the same line, so Git cannot decide which version wins…