Merging git conflicts in XCode 4 (sort of)

I'm sure that Apple has an ingeniously "natural" way built into XCode that allows you to merge git conflicts and be done with them. I haven't figured it out. I'm not a git pro, though, so perhaps that has something to do with it? Anyway, here's how I figured out how to do it:

[This is from memory and subject to change]

1. resolve your conflict
2. Commit. By commit I don't mean select all the individual files you want to commit and commit them; I mean perform a commit from the repository viewer or file menu. If you try to do it the other way, you may need to do a "git reset --merge" or something like that.