message no. 105960
Posted by bret in #github at 2015-07-31T23:11:32Z
any conflicts, git will yell at you and let you use a merge tool of your choice to figure out overlap
Posted by bret in #github at 2015-07-31T23:11:32Z