mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

problems with version 3 upgrade instructions

Browse source
This commit is contained in:
http://christian.amsuess.com/chrysn 2011-08-10 16:56:51 +00:00 committed by admin
parent 20a8f8c85b
commit f8282b55ce
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
doc/forum/version_3_upgrade.mdwn Normal file
View file

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