blob: 476b8c235f031ed75b53457a7332b759c416fdfa (
plain)
1
2
3
4
5
6
7
8
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
|
