Just a general tip here: most people I know don't use an IDE plugin or whatever for Git. Most people I know (myself included) use the terminal for it, since it is a lot faster and easier to figure out what is what. A lot of people also use different GUI tools. I can't remember what they all arem Also, you'll want to get kdiff3 on both computers, and set it as your mergetool. Or if you feel like shelling out the extra $$$, get Beyond Compare.