From f8282b55cece7561cd04788637627e79d2f29e17 Mon Sep 17 00:00:00 2001 From: "http://christian.amsuess.com/chrysn" Date: Wed, 10 Aug 2011 16:56:51 +0000 Subject: [PATCH] problems with version 3 upgrade instructions --- doc/forum/version_3_upgrade.mdwn | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 doc/forum/version_3_upgrade.mdwn diff --git a/doc/forum/version_3_upgrade.mdwn b/doc/forum/version_3_upgrade.mdwn new file mode 100644 index 0000000000..476b8c235f --- /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