◐/

BROWSE108 notes

Filter notes/

Enter opens the top match. Use /regex/i for patterns.

▸Software Enginner1

▾Branching & Merging4

Resolve a merge conflict

git branch & switch

▸History & Undo1

▸Inspect & Compare1

▸History Rewriting2

▸Remotes & Sync1

▸Tags & Releases1

▸Kubernetes16

▸GitHub Actions15

Fix bugs or Add features docker system prune curl API testing: repeat 100×, load & timing Install .deb files & alternative install methods (Ubuntu)

⌂Home ◐Search◎Graph

Git/Branching & Merging/git merge

CommandUpdated last month

git merge

Combines another branch's changes into your current branch, preserving both branches' history as-is.

Command

Merge a branch in

SHELL

1git switch main

2git merge <branch-name>

3

4# always create a merge commit, even if it could fast-forward

5git merge --no-ff <branch-name>

If it conflicts

Git pauses mid-merge and marks the conflicting files — see "Resolve a merge conflict" for the recovery steps.

On this page

Command If it conflicts

Referenced by5

git branch & switch

Branches are cheap, disposable pointers to a commit. Create one per feature or fix and switch between them freely.

Replays your branch's commits on top of another branch's tip, producing linear history instead of a merge commit.

Resolve a merge conflict

Git stops and asks you to decide when the same lines were changed on both sides. Here's the sequence that gets you out cleanly.

Compare branches & commits

The commands for 'is this branch ahead/behind', 'what's the common ancestor', and 'what will merging this actually bring in' — gathered in one place instead of re-derived from log/diff each time.

Merge vs rebase conflict strategies — ours vs theirs

"ours" and "theirs" mean opposite things depending on whether you're merging or rebasing — because rebase replays your own commits as if they were incoming patches onto a different HEAD. Every combination, in one place.

Leads to

relatedgit rebase relatedResolve a merge conflict relatedMerge vs rebase conflict strategies — ours vs theirs