From e4ef8c37b59d148cbc23f6aba2414a4c3aba3a9e Mon Sep 17 00:00:00 2001 From: Tim Byrne Date: Tue, 31 Jan 2017 22:09:59 -0600 Subject: [PATCH] Update documentation for stashed conflicts during clone --- _docs/030_getting_started.md | 5 ++--- _docs/060_faq.md | 18 ++++++------------ 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/_docs/030_getting_started.md b/_docs/030_getting_started.md index b68ed6e..421269c 100644 --- a/_docs/030_getting_started.md +++ b/_docs/030_getting_started.md @@ -23,9 +23,8 @@ Clone your existing repo using **yadm**. yadm status The `clone` command will attempt to `merge` your existing repository, but if it -fails, it will do a `reset` instead and you'll have to decide best on how -resolve the differences. See -[this question](faq#i-just-cloned-my-repository-but-yadm-status-shows-conflicts-why) +fails, it will `stash` any conflicting data. See +[this question](faq#i-just-cloned-my-repository-and-conflicting-data-was-overwritten-why) in the FAQ if you need help. --- diff --git a/_docs/060_faq.md b/_docs/060_faq.md index 0a34868..f6d1b69 100644 --- a/_docs/060_faq.md +++ b/_docs/060_faq.md @@ -6,22 +6,16 @@ permalink: /docs/faq ## Usage -### I just cloned my repository, but `yadm status` shows conflicts. Why? +### I just cloned my repository and conflicting data was overwritten. Why? Prior to cloning your repository, files managed by **yadm** already existed. For example, imagine you are logged into a system and `$HOME/.bash_profile` already exists. If you then clone your **yadm** repository—which also contains -`.bash_profile`—then you will likely get a conflict. You must decide how to -resolve that conflict. Perhaps you don't want to overwrite the current version. -You might want merge the content together in some way. This can be resolved the -same way you resolve any Git conflict. - -If you merely want to forcefully overwrite all the managed files using the HEAD -revision of your repository, you probably want to run - -``` -yadm reset --hard HEAD -``` +`.bash_profile`—then you will likely get a conflict. Since version 1.07, +**yadm** responds by "stashing" these conflicts. To view the stashed data, you can +run `yadm stash show -p` from within your `$HOME` directory. If you want to +restore the stashed data, you can run `yadm stash apply` from within your +`$HOME` directory. ### While committing I got the message, _"Please tell me who you are"_. Why?