Sikau

Git & GitHub · Day 18 · about 45 min

Capstone: A day on the team

Clone, branch, PR, pull, conflict, release.

Everything, end to end

Your first full day on the team: get the code, build a feature on a branch, merge it once it's reviewed, cope with a teammate's change, and cut a release.

A day on the team, step by step

The capstone strings together everything from the course in the order a real working day follows. Read the whole task before typing, and write the plan as a list of commands first — that turns a long challenge into a checklist where each step is small and familiar.

  • Start from an up-to-date main (git pull).
  • Branch for your feature, make the change, commit with a clear message.
  • Pull again: a teammate has pushed meanwhile.
  • Merge your feature into main; resolve the conflict if there is one.
  • Push main.
  • Tag the release and push the tag.
  • Delete the finished branch.

Check with git status and git log --oneline --graph after every couple of steps. Those two commands tell you where you are, what's waiting and what history looks like — the same habits professionals rely on daily.

The rest of this lesson

  • When things go sidewaysexplain
  • The professional orderorder
  • Escape hatchesmatch
  • Who is ahead?predict
  • Ship itchallenge
  • Badge quizquiz
  • Git & GitHub complete!recap

Continue this lesson free — run real code in your browser

Continue with Google

See all 18 lessons of Git & GitHub