Walk-through of Simple Workflow

This sequence represents a workflow where my teammate first makes a change locally and pushes. I also make a change locally--but now I must integrate their change (via a git pull origin main) before I too can push.

Click into each step to view the details.

(Note that the steps are arranged such that, once you've clicked on one of them, you can bounce back and forth between them with right and left arrow keys, visually comparing frame-by-frame what happens between steps.)

Step 1 - Everybody checkout main

Step 2 - Teammate commits work

Step 3 - Teammate pushes

Step 4 - I make local changes too

Step 5.1 - I pull (first 1/2 - fetch)

Step 5.2 - I pull (second 1/2 - merge)

Step 6 - I push main to "origin"