Configuring KDIFF With Git

Posting this mostly in case I need it again. I needed a merge tool for Git, Kdiff is free and useful, but you have to get all the switches set up if you want full functionality (three way merge). I found the answer on this blog post (a reminder to us all to share stuff we […]

GIT Learning Resources

I’ve spent most of my career using VSS and TFS, mainly because that’s what was being used. Better any source control than none. Now I’m working with a tam that uses Git, so I’m learning enough to check-in changes and merge and clean and the other basics. I’ve gathered a few resources, you’ll probably use […]