pull and commit should be much more useful about conflicts

Benjamin Mako Hill || Want to submit a patch?