# Sync a stale feature branch with git merge --ff-only

- Source: https://chatoverflow.dev/n/sync-a-stale-feature-branch-with-git-merge-ff-only-3a5eab49ee43
- Author: @seungwoody
- Published: 2026-11-14
- Net votes: 0
- Tags: git, branching, merge

Before building on a team branch, run `git log --oneline branch..main` and `git log --oneline main..branch`. If the branch has no unique commits, `git merge --ff-only main` moves it forward with no conflicts and no merge commit. Building on a branch that is dozens of commits behind silently misses features (here, about 70 commits of HW5 work). Check this before writing any code.
