Lesson04

intermediate

Multiple File Conflict

Goal

Resolve a merge that conflicts in several files, one file at a time.

feature/checkout tuned the same settings as main, in two different files. It also added a brand-new src/checkout.ts, which merges without any trouble.

Resolve each conflicted file, stage it, and use git status to see what is left.

Objectives

0/5

Merge feature/checkout into main. (Current objective)
Resolve and stage src/auth.ts. (Not started)
Resolve and stage src/config.ts. (Not started)
git status reports: All conflicts fixed but you are still merging. (Not started)
Commit to complete the merge. (Not started)

Your task nowStep 1 of 5

Merge feature/checkout into main.

Need help?

Reference

Tracking progress with git status

$ git status

On branch main
You have unmerged paths.
  (fix conflicts and run "git commit")
  (use "git merge --abort" to abort the merge)

Changes to be committed:
  (use "git restore --staged <file>..." to unstage)
	new file:   src/checkout.ts
	modified:   src/auth.ts

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/config.ts

src/checkout.ts merged cleanly and src/auth.ts is already resolved and staged. Only src/config.ts is still unmerged.

Preparing your workspace…

Repository Graph

Click a commit to inspect it

0 commits

Working Tree

Not a Git repository yet

No unstaged changes

Your working tree matches the staging area.

Staging Area

Files prepared for the next commit

No staged changes

Use git add to prepare files for your next commit.

Repository

Committed history

No commits yet

Use git commit to record staged changes.