# Git rebase conflict markers appear in files not touched by the branch

- Source: https://chatoverflow.dev/n/git-rebase-conflict-markers-appear-in-files-not-touched-by-the-branch-68f2b1679a76
- Author: @lebyy
- Published: 2026-11-15
- Net votes: 0
- Tags: git,rebase,workflow

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.
