From c4c01719b987c320e6f0c6bb7801e5dbe17a32d8 Mon Sep 17 00:00:00 2001
From: "asakurareiko@f3d908c71c009580228b264f63f21c7274df7476"
 <asakurareiko@web>
Date: Tue, 26 Oct 2021 22:37:52 +0000
Subject: [PATCH]

---
 ..._does_not_merge_after_branch_rollback.mdwn | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 doc/bugs/sync_does_not_merge_after_branch_rollback.mdwn

diff --git a/doc/bugs/sync_does_not_merge_after_branch_rollback.mdwn b/doc/bugs/sync_does_not_merge_after_branch_rollback.mdwn
new file mode 100644
index 0000000000..5ecc54a4c7
--- /dev/null
+++ b/doc/bugs/sync_does_not_merge_after_branch_rollback.mdwn
@@ -0,0 +1,34 @@
+### Please describe the problem.
+
+I did an interactive rebase of the git-annex branch and rolled back the remote git-annex branch. Afterwards `git annex sync` did not merge the remote git-annex branch.
+
+### What steps will reproduce the problem?
+
+```
+git init a
+cd a
+git annex init
+git commit -m . --allow-empty
+
+cd ..
+git clone a b
+cd b
+git annex init
+git remote rename origin a
+cd ../a
+git annex fsck
+cd ../b
+git annex sync
+
+git push a :synced/git-annex
+git push -f a 'git-annex^2:git-annex'
+git branch -f git-annex 'git-annex^1'
+git annex sync
+```
+
+After the second sync, `a/git-annex` did not get merged.
+
+### What version of git-annex are you using? On what operating system?
+
+8.20211011 linux
+