Branches, remotes and PRs

A branch is a movable pointer to a commit. Feature branches let you experiment without disturbing main. Pull requests add review and discussion.

git switch -c feature/pricing
# make changes
git add .
git commit -m "Add pricing comparison table"

git push -u origin feature/pricing

# after review and merge
git switch main
git pull
git branch -d feature/pricing

Resolving a conflict

A conflict happens when two branches change the same lines. Git marks the overlap; you choose the final content, remove the markers, then commit.

<<<<<<< HEAD
const price = 19;
=======
const price = 24;
>>>>>>> feature/pricing