Git Conflict Exercise


We believe that most of you are already familiar with Git basic commands. The tough part that you may want to learn more is conflict resolving. Here's an exercise of conflict resolving:

Although there's nothing to turn in, we hope you can look through this tutorial and find it useful. It may also be useful to look through this toolset when you design your project.

If you're not familiar with Git yet, checkout this Git tutorial.