|
|
|
@ -8,17 +8,6 @@ permalink: /docs/faq
|
|
|
|
|
|
|
|
|
|
## Usage
|
|
|
|
|
|
|
|
|
|
### 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. 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?
|
|
|
|
|
|
|
|
|
|
Whenever a Git commit is generated, Git requires information about the author of
|
|
|
|
@ -45,15 +34,6 @@ yadm gitconfig "user.name" "Alternate Name"
|
|
|
|
|
Note: Configuring these settings directly in the yadm repo will require you
|
|
|
|
|
to configure it each time you clone the repo.
|
|
|
|
|
|
|
|
|
|
### Why was I prompted to login twice while cloning my repo?
|
|
|
|
|
|
|
|
|
|
yadm needs to query your repo to determine the default branch used. When you are
|
|
|
|
|
using a private repository, this additional query also requires authentication.
|
|
|
|
|
You can avoid the double login by specifying which branch to clone using the
|
|
|
|
|
`-b` option.
|
|
|
|
|
|
|
|
|
|
yadm clone -b <branch> <url>
|
|
|
|
|
|
|
|
|
|
### How can I display untracked files with a `yadm status` command?
|
|
|
|
|
|
|
|
|
|
By default, yadm is configured to ignore untracked files when displaying a
|
|
|
|
|