psi-jack
/
yadm
mirror of
1
0
Fork 0
Code Issues Releases Wiki Activity

Indicate `stash` should be run from within `$HOME`

This commit is contained in:
Tim Byrne 2017-01-27 08:22:31 -06:00
parent e90ebd67be
commit 7f6fe24280
No known key found for this signature in database
GPG Key ID: 6CBE24C2FD8CF76E
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
yadm
View File

@ -246,10 +246,12 @@ function clone() {
This likely happened because you had files in \$HOME This likely happened because you had files in \$HOME
which conflicted with files tracked by origin/master. which conflicted with files tracked by origin/master.
You can review the stashed conflicts with the command You can review the stashed conflicts with the
'yadm stash show -p'. If you want to restore the stashed command 'yadm stash show -p' from within your
data, you can run 'yadm stash apply' or 'yadm stash pop' \$HOME directory. If you want to restore the
and then handle the conflicts in another way. stashed data, you can run 'yadm stash apply' or
'yadm stash pop' and then handle the conflicts
in another way.
EOF EOF
else else
#; skip auto_bootstrap if conflicts could not be stashed #; skip auto_bootstrap if conflicts could not be stashed