Try it: branch, commit, resolve a conflict

You need Git set up as in lesson 2.5.1, Node and a terminal.

1. Clone it and run it

   Copy

   git clone https://github.com/computesphere-samples/learn-merge-conflict.git
   cd learn-merge-conflict
   git log --oneline
   node -e "console.log(require('./greeting'))"
   

   You should seeTwo commits on main, and the greeting Good day, world.

2. Look at the other branch

   Copy

   git switch friendly-greeting
   git log --oneline
   node -e "console.log(require('./greeting'))"
   

   Git also prints branch 'friendly-greeting' set up to track 'origin/friendly-greeting'. That's harmless: your local branch remembers the copy you cloned it from.

   Both branches start from Add greeting, then change the same line.

   You should seeSwitched to a new branch 'friendly-greeting'; its log has Make the greeting friendly on top of Add greeting, and it prints Hey there, world!

3. Go back to main and merge

   Copy

   git switch main
   git merge friendly-greeting
   

   git status now lists greeting.js under Unmerged paths, as both modified. Want out? git merge --abort puts everything back as it was before the merge.

   You should seeCONFLICT (content): Merge conflict in greeting.js, then Automatic merge failed; fix conflicts and then commit the result.

4. Read the conflict

   Open greeting.js in your editor:

   Copy

   <<<<<<< HEAD
   module.exports = "Good day, world";
   =======
   module.exports = "Hey there, world!";
   >>>>>>> friendly-greeting
   

   Above ======= is the version from HEAD, the branch you're on (main). Below it is the one from friendly-greeting. Until you fix the file, it isn't valid JavaScript: running it now fails with a SyntaxError.

   Check yourself

   Which line came from main?

   The line above the row of equals signsThe line below the row of equals signs

   You should seeBoth versions of the line, between three markers.

5. Resolve it

   Replace all five lines with what the file should say. Keep one side, or combine them:

   Copy

   module.exports = "Hey there, good day, world!";
   

   Delete every marker line. Git doesn't check your choice; it only needs the markers gone.

   You should seegreeting.js is one line of valid JavaScript, with no markers left.

6. Mark it resolved and commit

   Copy

   git add greeting.js
   git commit --no-edit
   

   git add tells Git the conflict is resolved. --no-edit accepts Git's merge message instead of opening an editor.

   You should see[main …] Merge branch 'friendly-greeting'

7. Check the result

   Copy

   node -e "console.log(require('./greeting'))"
   git log --oneline --graph
   

   You should seeYour greeting prints, and the graph shows both branches joining at the merge commit.