message no. 115834
Posted by Guest35357 in #github at 2015-10-12T04:28:17Z
When I push something, other team members try to merge it with their own fork's master using Github for Windows, they get conflicts, and the View-Conflicts button takes them nowhere