[kylelanman]

Thanks for this wonderful tutorial. I have heard the concept of version control before but this is my first time using it so bare with me.

What is the best way to handle two people doing a checkout, changing files, committing and pushing. If I'm not mistaken the second person will get an error when they try to push saying there local branch is out of date. If you follow the suggestion of updating then you end up with conflicts. When you use resolve you end up with a file with lines like these.

<<<<<<< TREE
=======
>>>>>>> MERGE-SOURCE

You are then able to push but then you have those added lines to break the compiler.