Resolve a schedule conflict with a stated decision

Resolve a schedule conflict with a stated decision — guided practice

Resolve a deliberate same-line conflict using a supplied policy.

Continue on main after lesson 4. A disposable practice conflict is safe; do not run this in shared work. The approved policy for this exercise is open 11-13.

1. 1. Create one proposal

   Run the switch command. Then stop in the terminal: change Hours: 10-12 to Hours: 11-12 in your editor and save.

   git switch -c hours-proposal

   You should see: The proposal working file contains 11-12.

   Switch before editing so the proposal begins from the intended branch.

2. 2. Commit the opening proposal

   After saving the 11-12 edit, stage and commit it.

   git add notice.txt
   git commit -m "Propose later opening"

   You should see: hours-proposal has a saved opening change.

   The edit must exist before staging can capture it.

3. 3. Start the competing proposal

   Switch to main with the command. Then stop in the terminal: change Hours: 10-12 to Hours: 10-13 in your editor and save.

   git switch main

   You should see: The main working file contains 10-13.

   The original main state supplies the competing same-line edit.

4. 4. Commit the closing proposal

   After saving the 10-13 edit, stage and commit it.

   git add notice.txt
   git commit -m "Propose later closing"

   You should see: Main and hours-proposal now contain different committed changes to the same original line.

   Both proposals need saved histories for this deliberate merge conflict.

5. 5. Merge and decide

   Run git merge hours-proposal. Open notice.txt and replace the entire conflict block, including all markers, with Hours: 11-13.

   git merge hours-proposal

   You should see: Exactly one Hours line remains and no marker lines remain.

   Neither branch alone matches the approved combined decision.

6. 6. Finish the merge

   Stage notice.txt and commit the resolution. Read all four lines.

   git add notice.txt
   git commit -m "Resolve hours to approved 11-13"
   git status --short

   You should see: The title, Bring and Access lines remain; Hours is 11-13.

   Resolving the conflict should preserve unrelated correct content.