I'm a little over a week into a git immersion program. Let me just say that git's reputation of being a little arcane (okay, more than a little) and having a steep learning curve is 100% deserved.
One thing that would mitigate things is if git would give you feedback when you tell it to do nonsense. But it doesn't. Here's me trying to get machine B to always merge the debug branch from machine A when I pull:
232 git config branch.debug.remote origin 234 git config branch.master.remote origin 236 git config branch.master.remote origin/debug
All of these commands completed silently. None accomplished what I wanted. In the end I renamed master to old and debug to master to avoid having to fight it. Then I blew away my working copy and re-cloned because those config statements had created a new problem that I didn't know how to undo.
I'm sure the git virtuosos out there will know what was wrong. That's not the point. The point is that the tool gave me no feedback. It was like git was telling me, "Figure it out yourself. Or don't. I don't care." Which is par for the course with my git experience so far.