I don't understand why I get the error: Please commit your changes or stash them before you merge.
when the command I'm running (via "sudo port sync") is "/opt/local/bin/git pull --rebase --autostash". Why won't it automatically stash? Usually it does, but apparently not when there are conflicts.
