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

Conflicts that need understanding

Picking a side without reading can discard an important intent.

Learning paths18 min

Let's discover together

  1. 1

    In LAB.md, two branches change the first README line: one emphasizes tools, another practice. Merge stops and status lists an unresolved file. It does not prove either author is wrong; Git needs a decision about the result.

  2. 2

    Starting this exercise from a clean status lets git merge --abort return to the pre-attempt state. Existing uncommitted changes can make recovery harder in real merges, so the lab starts clean. Aborting does not delete all history.

  3. 3

    Repeat the merge, read the versions marked by <<<<<<<, ======= and >>>>>>>, and write a final line preserving both ideas. Remove markers, inspect the diff and stage README.md. Avoid choosing ours/theirs without understanding which branch each side represents in this command.

  4. 4

    Commit the resolution, run tests and reread the final text. A merge without text conflicts can still break behavior; Git does not understand every requirement. Record the reasoning in REVIEW.md and update the reviewer after pushing.

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 merge --abort
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

Reproduce, abort and resolve a conflict while preserving both intents.

Now it's your turn

Discovery workshop

A decision with evidence

Two desired versions: “tools” and “practice”. The result must preserve both ideas.
Build your answers and check when you are ready.
A moment to understand

What demonstrates resolution?

I need a hint

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

Loading your journey…

Take it with you

Record conflict status, abort behavior and the resolved result. Explain how the final line preserves both intents.

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.