Fri Mar 4 12:11:19 EST 2011
When there is a conflict after a merge, git will tell you:
Automatic cherry-pick failed. After resolving the conflicts,
mark the corrected paths with 'git add <paths>' or 'git rm <paths>'
and commit the result with:
git commit -c e27ab5dddd2ee284e9dcc8ae96b67be9cf5d9857
The part of the merge that succeeded will be checked into the index,
and the part that conflicted will not be checked into the index.
Go to the offending file(s) and fix the problem in an editor.