Rullst AcademyRullst Academy/Lesson
Git: changes as a team · Lesson 06 / 10

When the proposal changes

A passing test from yesterday may not describe today’s code.

Learning paths14 min

Let's discover together

  1. 1

    Reviewer adds a README line on main and pushes to the local remote. Author continues on the fix branch. A new file or base change may alter context without editing the reviewed function.

  2. 2

    In author, confirm a clean status, fetch origin and inspect differences before git merge origin/main. This route uses merge to preserve shared commits; rebasing and history rewriting are later topics. Do not force push to bypass divergence.

  3. 3

    Rerun tests after integrating base. A new head commit changes the proposal. Record the current version with git rev-parse HEAD and tell the reviewer what changed; old approval does not prove new code was inspected.

  4. 4

    Our learning agreement requires review of the current state. On GitHub, dismissing stale approvals or requiring new reviews depends on configured rules. When checks test a temporary merge, inspect the head and base used too; do not compare only a green label.

One change, two roles

Download the kit and follow LAB.md in a new folder. Commands here are reading references; the site does not execute them. Use Git Bash on Windows and a terminal on macOS/Ubuntu. Earlier tracks cover Git and Python setup.

git status
git fetch origin
git merge --no-edit origin/main
python -m unittest discover -v
My files and GitHub

Edit, download and send your Markdown notebook to GitHub with confirmation. It does not run Git or open pull requests. The kit is the starter; save edits separately.

Official links and next step

✦
YOUR MISSION

Update a branch and tie review and tests to the right version.

Now it's your turn

Discovery workshop

A decision with evidence

Review: commit A. Current head: commit B. The agreement requires reviewing the current change.
Build your answers and check when you are ready.
A moment to understand

What is missing before integration?

I need a hint

Compare the agreement with the diff and evidence for the current commit.

Loading your journey…

Take it with you

Update base using LAB.md and compare hashes before/after. Update the proposal and reviewer evidence.

At your own pace

My files and GitHub

Every lesson can become your own record: code, notes or a practice plan. Saving a file to GitHub is optional and does not change your XP.

Student guide

The editor and downloads open when this lesson is available to your account. Check access below or return to the track map.

Checking your access to this lesson…

Rullstpetbot

AI can make mistakes. Check the lesson material.