gpull/gpush: Improve handling for unstash conflicts.