Quick bit that threw me off in git initially: A merge doesn't merge you into something else.  It merges something else into you.

git merge crazyBranch

... takes in crazyBranch and puts it into whatever branch you're in now, which you can figure out with...

git branch

So if I'm in "myBranch" and I hit git merge crazyBranch, now anything in crazyBranch, assuming it doesn't conflict with what I've done, is sitting in myBranch.  myBranch did not merge with crazyBranch.  It's still wholly crazy.

Capiche?

Labels: