Master programming syntax, solve interactive challenges & run live code in Syntaxis Explore Arena →

menu_book Course Curriculum (Git Version Control) expand_more

Repository Foundations

Initialize a repository Clone a repository Working tree status Inspect unstaged differences Stage files Inspect staged differences Create a commit View commit history

Branches & Merging

Create a branch Switch branches Restore a file Fast-forward merge Three-way merge Resolve merge conflicts Delete merged branches Compare branches

History Editing

Amend the last commit Soft reset Mixed reset Hard reset Interactive rebase Squash commits Cherry-pick a commit Recover with reflog

Remote Collaboration

Add a remote Fetch remote changes Pull with rebase Push a branch Set upstream branch Inspect remote branches Push tags Delete remote branch

Selective Workflows

Git stash Stash selected paths Apply versus pop Partial staging Restore staged file Git worktree Git bisect Sparse checkout

Objects & Internals

Inspect HEAD Inspect refs git cat-file git hash-object git ls-tree git rev-parse Annotated tags Garbage collection

Configuration & Hooks

Repository configuration Global configuration Git aliases Ignore patterns Attributes file Pre-commit hook Commit-msg hook Signed commits

Production Workflows

Feature branch workflow Trunk-based workflow Release tags Conventional commits Submodules Subtree merge Bundle repository Repository backup and recovery

Git Version Control / Branches & Merging

Resolve merge conflicts

Learn Resolve merge conflicts in Git Version Control with a dedicated explanation, a topic-specific example, edge guidance, and a mastery check.

12 min read • Beginner

git-014.sh

shell

rm -rf /tmp/sx-git-14; git init -q /tmp/sx-git-14; cd /tmp/sx-git-14; git config user.name Syntaxis; git config user.email lesson@example.test; printf "base\n" > app.txt; git add app.txt; git commit -qm base; git switch -c feature; echo feature > app.txt; git commit -am feature -q; git switch master 2>/dev/null || git switch main; echo main > app.txt; git commit -am main -q; git merge feature || true; printf "resolved\n" > app.txt; git add app.txt; git commit -m "resolve conflict"

What to watch

Content source & attribution

Original Syntaxis Content · Original Syntaxis Content

Lesson quizzes

Resolve merge conflicts Mastery Check →

Three-way merge

Delete merged branches