Module 3 Exercise 2: Merge conflicts


(Ethan McGee) #81

I was able to force a merge conflict and then resolve it! Yay…!


(Bgarnb) #82

This is my screenshot from my pull request


(John Isaacs) #83

no merge conflict as I couldn’t join a team with other members :frowning: Made my own branch for the pull request though.


(Harun Umar) #84

Hello @mozzadrella, @ccannon94 here are my screenshot for Module 3 Exercise 2: Merge conflicts.


(Chris Cannon) #85

Beautiful! :100:


(Rsolisuaz) #86


Here is the snapshot for Exercise 3.3, no merge conflict


(Jstaso) #87

Had a bit of trouble with this one but here’s the pull request



(Jared Rigby) #88


(Mari Potgieter) #89

Here is my screenshot:


(Edward A. Roualdes) #90

@ccannon94 Here’s a screen shot with evidence of a forced merge conflict and PR from a branch named other. My reply here is quite delayed, thanks for your patience.


(Claudio Santoro) #91

Yahool


(Roman Yasinovskyy) #92

Here is my screenshot with a merged PR.


(John Simonsen) #93


(PEDRO GONZALEZ YANES) #94


(Mahesh Chugani) #95


(Lebedevdes) #96

This is merge conflict.

And result of resolving conflict.


(José Luis Raffalli) #97

Conflict, accepted both changes.

In GitHub team repository:


(Cynthia Teeters) #98

I need to have my students use the GitHub UI more than the command line, if at all.

So, I purposely created a conflict.

I then clicked the “Resolve Conflicts” button to get into this editor.

Then I edited out the conflict.

At which point the “Mark as resolved” button became active. I clicked that and got a green “Commit merge” button. Clicked that and got this page.

Then completed the “Merge pull request” and deleted the branch.

This whole exercise helped me immensely in figuring out merge conflicts.


(Dominique Charlebois) #99


(Shangni Hu) #100