Branching and pull requests without the drama

Branches let you work safely without destabilizing main.

A practical branch workflow

1. Start from an updated main.
2. Create a focused branch.
3. Commit in small chunks.
4. Open a pull request (PR).
5. Merge once checks pass.

git checkout main
git pull
git checkout -b feat/free-course-landing

Keep PRs easy to review

Small PRs are merged faster and introduce fewer bugs. Aim for one problem per PR, with clear context in the description:

• What changed?
• Why now?
• How to test it?

If you get conflicts

Conflicts are normal. Resolve them calmly:

git fetch origin
git rebase origin/main

Fix conflicted files, then continue:

git add .
git rebase --continue

The goal isn't to avoid conflicts forever. The goal is to keep your branch short-lived and your changes focused.