dgit.raspbian.org Git - git-annex.git/blob

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