close not a bug

diff --git a/doc/bugs/sync_merges_local-to-repo_adjusted_branch.mdwn b/doc/bugs/sync_merges_local-to-repo_adjusted_branch.mdwn
index 781e65bcf3aa0da9caf5300b3592625b222f5660..78e19fe5c973e7393059f18480b3a662c29a049c 100644 (file)
--- a/doc/bugs/sync_merges_local-to-repo_adjusted_branch.mdwn
+++ b/doc/bugs/sync_merges_local-to-repo_adjusted_branch.mdwn
@@ -15,3 +15,5 @@ Given that repo1 and repo2 both have a branch adjusted/master(hidemissing), thos
      + 20bcd18...170148a adjusted/master(hidemissing) -> WD250G/adjusted/master(hidemissing)  (forced update)
        a071f8c..4a1f6d3  git-annex                    -> WD250G/git-annex
     pull WD250G ok
+
+> [[not a bug|done]] --[[Joey]]

diff --git a/doc/bugs/sync_merges_local-to-repo_adjusted_branch/comment_2_36561048dd9e94721ec14a8c36c203f2._comment b/doc/bugs/sync_merges_local-to-repo_adjusted_branch/comment_2_36561048dd9e94721ec14a8c36c203f2._comment
new file mode 100644 (file)
index 0000000..57c0f5b
--- /dev/null
+++ b/doc/bugs/sync_merges_local-to-repo_adjusted_branch/comment_2_36561048dd9e94721ec14a8c36c203f2._comment
@@ -0,0 +1,26 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 2"""
+ date="2021-07-13T17:27:57Z"
+ content="""
+Like Lukey said, your output does not show branches being "forcibly merged". What it shows
+is `git fetch WD250G` running and fetching a
+"WD250G/adjusted/master(hidemissing)" ref. That updates a previous version
+of that it fetched from the remote before.
+
+Nothing else will be done with that ref, as far as I can see. It's just
+being maintained by git as a remote tracking branch, the same as it would
+keep track of any other branch that happened to be on the remote.
+
+You can configure git to not fetch this or other branches, by
+changing the remote.WD250G.fetch git config.
+
+Now, what `git annex sync` does do, when in an adjusted branch, is
+propigate any changes that you have made to that branch back to the master
+branch, and then it pushes the master branch over to the remote. And if the
+remote is also in an adjusted branch, then running `git annex sync` on
+the remote will merge in those changes from the master branch. But
+when the branch is a --hide-missing branch, this process does not cause
+files that are missing on the one repo to get deleted from the branch on
+the other repo.
+"""]]