psi-jack/yadm
1
0
Fork 0
mirror of synced 2024-12-22 14:41:07 -05:00
Code Issues Releases Wiki Activity

Update documentation for stashed conflicts during clone

Browse source
This commit is contained in:
Tim Byrne 2017-01-31 22:09:59 -06:00
parent 2f95fca1c4
commit e4ef8c37b5
No known key found for this signature in database
GPG key ID: 14DB4FC2465A4B12
2 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
_docs/030_getting_started.md
View file

@ -23,9 +23,8 @@ Clone your existing repo using **yadm**.
yadm status yadm status
The `clone` command will attempt to `merge` your existing repository, but if it 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 fails, it will `stash` any conflicting data. See
resolve the differences. See [this question](faq#i-just-cloned-my-repository-and-conflicting-data-was-overwritten-why)
[this question](faq#i-just-cloned-my-repository-but-yadm-status-shows-conflicts-why)
in the FAQ if you need help. in the FAQ if you need help.
--- ---

18
_docs/060_faq.md
View file

@ -6,22 +6,16 @@ permalink: /docs/faq
## Usage ## 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 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 example, imagine you are logged into a system and `$HOME/.bash_profile` already
exists. If you then clone your **yadm** repository—which also contains 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 `.bash_profile`—then you will likely get a conflict. Since version 1.07,
resolve that conflict. Perhaps you don't want to overwrite the current version. **yadm** responds by "stashing" these conflicts. To view the stashed data, you can
You might want merge the content together in some way. This can be resolved the run `yadm stash show -p` from within your `$HOME` directory. If you want to
same way you resolve any Git conflict. restore the stashed data, you can run `yadm stash apply` from within your
`$HOME` directory.
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
```
### While committing I got the message, _"Please tell me who you are"_. Why? ### While committing I got the message, _"Please tell me who you are"_. Why?