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.