git rebase

Merge conflicts happen when two people edit the same piece of code and both want to merge into the main branch. This article compares three practical resolution methods — manual editing, VS Code/vimdiff, and the ours/theirs strategy — plus team workflow habits that cut conflicts from several times a day to just a few times a week.