From e53bd0c6c060fbdd108e739e95433183e2125ceb Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 9 May 2021 20:58:35 -0400 Subject: [PATCH] user error, not a bug --- .../git_annex_merge_only_merges_synced_master_branch.mdwn | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 doc/bugs/git_annex_merge_only_merges_synced_master_branch.mdwn diff --git a/doc/bugs/git_annex_merge_only_merges_synced_master_branch.mdwn b/doc/bugs/git_annex_merge_only_merges_synced_master_branch.mdwn deleted file mode 100644 index 9ee66dcd28..0000000000 --- a/doc/bugs/git_annex_merge_only_merges_synced_master_branch.mdwn +++ /dev/null @@ -1,4 +0,0 @@ -If I do git-annex sync remote when in branch foo, -and then in the remote repo, do git-annex merge, -it does not merge the synced/foo branch, despite branch foo being checked -out. --[[Joey]]