diff --git a/vcsh b/vcsh index 7f475fe22b0b2ec256311e11af3e48d0595ac80b..c1b4874f5e78bcbbe5a8c8ccb2276f3ed25d23d9 100755 --- a/vcsh +++ b/vcsh @@ -144,6 +144,7 @@ elif [ "$1" = 'clone' ]; then done [ "$VCSH_CONFLICT" = '1' ] && echo "$SELF: fatal: will stop after fetching and not try to merge!\n" && + echo " Once this situation has been resolved, run 'vcsh run <foo> git pull' to finish cloning.\n" && exit 3 git merge origin/master # vcsh use $REPO_NAME