Drawn from http://software-carpentry.org/v5/novice/git/03-conflict.html
Question 1:
Which of the following is true about git conflicts?
a. Conflicts only happen when a developer makes a mistake.
b. Both developers involved in writing code that caused a conflict will have to work on resolving the conflict.
c. In order to resolve a conflict, a developer must review the conflicting changes.
d. A conflict means you have to rewrite the code that you just wrote.
e. git can automatically merge all conflicts.
Question 2:
Resolve the following merge conflict and explain why you chose to reconcile the changes the way you did:
«««< HEAD
Mercury
Venus
Earth
Mars
Jupiter
Saturn
Neptune
=======
Mercory
Venus
Earth
Mars
Jupiter
Saturn
Neptun
Uranus
dabb4c8c450e8475aee9b14b4383acc99f42af1d