|
|
|
@ -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?
|
|
|
|
|
|
|
|
|
|