When a merge goes well… until the first merge conflict

DutchGrover commited on 24 Jan 2017

Git-push when there are still conflicts

stef commited on 11 Nov 2014

When a colleague left an unresolved conflict in the SVN repository

fcalderan commited on 15 May 2013

When I update my code and there are no conflicts

crave commited on 9 Apr 2013