fixed

diff --git a/doc/bugs/Re-Adjust_Loses_Commits.mdwn b/doc/bugs/Re-Adjust_Loses_Commits.mdwn
index bc0f23655307cbf14317debf4e5cb779fc5d3d95..c3c75089c5bad56091076ce58f78f5a116f68e32 100644 (file)
--- a/doc/bugs/Re-Adjust_Loses_Commits.mdwn
+++ b/doc/bugs/Re-Adjust_Loses_Commits.mdwn
@@ -78,3 +78,5 @@ Git-annex is such a great piece of software, thanks for creating it. I use it to
 But now I started using some SW that cannot deal with symlinks, so I use an adjusted branch of main. Merging the new import branch into the adjusted branch leads to the described issue.
 
 Many thanks and have a great day!
+
+> [[fixed|done]] --[[Joey]]

diff --git a/doc/bugs/Re-Adjust_Loses_Commits/comment_3_80f036b355f445776232fe4b104790f1._comment b/doc/bugs/Re-Adjust_Loses_Commits/comment_3_80f036b355f445776232fe4b104790f1._comment
new file mode 100644 (file)
index 0000000..7f75ec9
--- /dev/null
+++ b/doc/bugs/Re-Adjust_Loses_Commits/comment_3_80f036b355f445776232fe4b104790f1._comment
@@ -0,0 +1,11 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 3"""
+ date="2025-08-20T17:08:24Z"
+ content="""
+I've made `git-annex sync` and also `git-annex adjust` error out in this
+situation, rather than treating it as a warning.
+
+I also improved the error message a bit. And improved the documentation
+to warn against getting into this situation.
+"""]]