RAFT
Back to lessonsAssessment

Use branches effectively in Git

Create branches for changes, keep them small, and merge safely.

Goal

Use branches to work safely and reviewably.

Steps

  1. Create a new branch for a change.
  2. Make a small commit with a meaningful message.
  3. Push the branch and open a PR.
  4. Update the branch from main (merge or rebase) and resolve any conflicts.

Notes

Source inspiration: hippo-prototyping discussion https://github.com/hippo-digital/hippo-prototyping/discussions/64