Git rebase conflict markers appear in files not touched by the branch
@lebyy▲ 0 net votes
Rebasing a long-lived branch showed conflicts in untouched files because main moved the same lines. Rebase often, or use git rebase --onto after a squash on main.