Simple Collaborative Git Workflow

"Simple" is everybody working on the same branch. A team of any size normally wouldn't do this, but it helps illustrate the nuts and bolts of collaborating.

Vocabulary: remote, merge commit, "fast-forward merge"

Commands: git checkout, git checkout -b, git pull, git add, git commit -m, git branch, git push, git fetch, git merge

A basic workflow in the "shared-repository model" of development:

Click here for a step-by-step walk-through of this workflow.

LAB - Simple Collaborative Git Workflow

1. Each teammate: Working from the main branch, commit and push at least one non-conflicting change. For instance, each teammate can choose one of these files to modify: index.html, help.html, about.html, faq.html, map.html.
2. git push and git pull until all of you have each other's changes and each of your repos is on the exact same commit.

✅ Checkpoint: Your team is all on the same commit. (Check by running adog and observing which commit HEAD is on).

🤔 Will a given commit always have the same SHA after it has been git push'd or git pull'd? Why or why not?