Dev.to
7/18/2026

The original title is: "Stop Rebasing Every Time: A Safer Way to Keep Your Git Branch Updated with `master`"
Original: Stop Rebasing Every Time: A Safer Way to Keep Your Git Branch Updated with `master`
Short summary
A practical guide to creating a Git alias that automates syncing feature branches with master using merge instead of rebase. The alias fetches, checks out, resets to remote, and merges with --no-ff in one command. It includes safety checks to prevent losing uncommitted work and warns about the destructive nature of git reset --hard.
- •Custom git sync-branch alias automates fetch, checkout, reset, and merge in one step
- •Uses merge --no-ff to preserve commit history instead of rebasing
- •Includes safety checks for uncommitted changes but warns about destructive reset --hard
Generated with AI, which can make mistakes.
Is this a good recommendation for you?



