+[2015-11-18T22:18:15Z]rboThe contributions tracker section? +[2015-11-18T22:22:00Z]devslashI 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 +[2015-11-18T22:26:52Z]gitinfodevslash: [!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, *don't panic*. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II +[2015-11-18T22:26:52Z]milkidevslash: !eek +[2015-11-18T23:03:02Z]rbo!contributions
+[2015-11-19T00:27:48Z]ferminoHeey +[2015-11-19T00:27:58Z]ferminoAny way to get back to the old repo look? +[2015-11-19T00:31:30Z]tomreynwhat changed there? +[2015-11-19T00:36:55Z]tomreynhttps://github.com/blog/broadcasts does not seem to discuss any recent changes +[2015-11-19T00:38:53Z]tomreynwell, gtg