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 pulldoes not merge the git-annex branch. You can merge it withgit annex merge, or it will be done automatically when you use other git-annex commands.If you use
git pullandgit pushwithout 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 (usegit push origin git-annexto manually push it then). Similarly,git pull origin masterwon't pull it. And also, theremote.origin.fetchsetting in.git/configcan be modified in ways that makegit pullnot automatically pull the git-annex branch. So those are the things to avoid after upgrade to v3, basically.