Resolving git conflicts using ‘theirs’ or ‘ours’
If you want to overwrite your local copy of the conflicted file use the following commands: git checkout –theirs path/to/the/conflicted_file.php git add path/to/the/conflicted_file.php If […]
Month: May 2015
Fixing “Insufficient Resources” error message in Microsoft MSMQ
PREAMBLE For MSMQ installations which do not have regular monitoring in place. there comes a time when an application using MSMQ gives an exception “Insufficient […]