message no. 120604
Posted by devslash in #github at 2015-11-18T22:22:00Z
I am relatively new to Git. I currently have my own repo in the master branch. If someone were to collaborate with me, we would each create our own branches and work on them independently. What happens when we go to merge the branches and there is a conflict where the same file has been modified by both branches