0/3

Lesson03

intermediate

Resolve Your First Conflict

Goal

Merge a branch, resolve the conflict by hand, and complete the merge.

On main, someone shortened the session timeout to 15 minutes. On feature/login, it was extended to 60. Both changed the same line of src/auth.ts.

Merge feature/login into main. When Git stops, open the file with the Resolve button, decide what the line should be, remove the markers and save.

Objectives

0/3
  1. Merge feature/login into main. Git stops with a conflict in src/auth.ts. (Current objective)
  2. Edit src/auth.ts to remove the conflict, save it, and stage it with git add. (Not started)
  3. Commit to complete the merge. (Not started)

Your task nowStep 1 of 3

Merge feature/login into main. Git stops with a conflict in src/auth.ts.

Need help?

Reference

Where you are headed

1. git merge feature/login     Git stops: CONFLICT in src/auth.ts
2. edit src/auth.ts            keep what you want, delete the markers, save
3. git add src/auth.ts         mark the conflict as resolved
4. git commit                  create the merge commit

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.