Up git Street without a paddle

I recently updated OSX to El Capitain (10.11). Over all I think it’s a great update. Nothing stellar, but stabilises a lot of stuff from Mav. It did stuff up my merge tool of choice in git though. I prefer diffmerge to the standard on OSX which is filemerge. The fix took me a while […]

Read More Up git Street without a paddle

Quick ways to get out of the git

Always have to search Stackoverflow for these git tips, so thought I would bang them into one place. How to merge either all local or all remote changes Single File git checkout –ours filename.c git checkout –theirs filename.c git add filename.c git commit -m “using theirs” Or for all files git checkout –ours . git […]

Read More Quick ways to get out of the git