diff options
| author |  http://christian.amsuess.com/chrysn <chrysn@web> | 2011-08-10 16:56:51 +0000 |
|---|---|---|
| committer |  admin <admin@branchable.com> | 2011-08-10 16:56:51 +0000 |
| commit | f8282b55cece7561cd04788637627e79d2f29e17 (patch) | |
| tree | e4e130247f07e6ce6461f0b05f7f81b6c597c000 | |
| parent | 20a8f8c85bbda5d8af90782a596abbb1b0ac1e86 (diff) | |
problems with version 3 upgrade instructions
| -rw-r--r-- | doc/forum/version_3_upgrade.mdwn | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/doc/forum/version_3_upgrade.mdwn b/doc/forum/version_3_upgrade.mdwn new file mode 100644 index 000000000..476b8c235 --- /dev/null +++ b/doc/forum/version_3_upgrade.mdwn @@ -0,0 +1,9 @@ +after upgrading to git-annex 3, i'm stuck with diverging git-annex branches -- i didn't manage to follow this line in the directions: + +> After this upgrade, you should make sure you include the git-annex branch when git pushing and pulling. + +could you explain how to do that in a littel more detail? git pull seems to only merge master, although i have these ``.git/config`` settings: + + [branch "git-annex"] + remote = poseidon + merge = git-annex |