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 = origin
    merge = git-annex

It's ok that git pull does not merge the git-annex branch. You can merge it with git annex merge, or it will be done automatically when you use other git-annex commands.

If you use git pull and git push without any options, the defaults will make git pull and push the git-annex branch automatically.

But if you're in the habit of doing git push origin master, that won't cause the git-annex branch to be pushed (use git push origin git-annex to manually push it then). Similarly, git pull origin master won't pull it. And also, the remote.origin.fetch setting in .git/config can be modified in ways that make git pull not automatically pull the git-annex branch. So those are the things to avoid after upgrade to v3, basically.

Comment by http://joey.kitenet.net/ Wed Aug 17 01:33:08 2011
Comments on this page are closed.