blob: 04b6d62027a10075ef098b662382cde76a0cc00d (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
|
[[!comment format=mdwn
username="joey"
subject="""comment 1"""
date="2018-02-26T17:38:05Z"
content="""
Seems that it's only merging from remotes/origin/synced/master, not
remotes/origin/master. When `git annex sync` is used in the first
repository, that works, but not when `git commit` is used.
And it's due to being in direct mode because the annex/direct/master
branch is checked out, so it tries to merge from
remotes/origin/direct/master, which doesn't exist.
This does not seem to be a reversion, but a long-ago oversight.
"""]]
|
