I consider myself lucky to work at a place where we have someone working QA to ensure the code we’re pushing out isn’t going to blow up. When a development ticket has passed through QA, we get an email to let us know. Usually saving the task of merging code until the end of the day allows me to spend the last bit of time doing something that doesn’t require a huge amount of brain power. Normally this consists of running a merge command and fixing a conflict that pops up every once in a while.
Occasionally things just don’t work out that way.
$ svn merge -r 24936:24937 http://blade00/svnroot/crm/trunk Conflict discovered in 'soapserver/soap_server_production.wsdl'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p --- Merging r24937 into 'soapserver': C soapserver/soap_server_production.wsdl Conflict discovered in 'soapserver/soap_server_uat.wsdl'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C soapserver/soap_server_uat.wsdl Conflict discovered in 'soapserver/soap_server_staging.wsdl'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C soapserver/soap_server_staging.wsdl Conflict discovered in 'soapserver/soap_server.php'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p --- Merging r24937 into 'soapserver/soap_server.php': C soapserver/soap_server.php Conflict discovered in 'soapserver/soap_server_dev.wsdl'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p --- Merging r24937 into 'soapserver': C soapserver/soap_server_dev.wsdl Summary of conflicts: Text conflicts: 5 |
Ahh… the joys of merging code.
