From c1b73ad35fca72a8acf8de090f11bf8d328e769a Mon Sep 17 00:00:00 2001 From: jafpoU Date: Tue, 4 Feb 2020 03:35:49 +0000 Subject: [PATCH] Added a comment --- ..._585648a04a02760a1f16394c00728d79._comment | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 doc/forum/git-annex-sync_without_syncing_master/comment_2_585648a04a02760a1f16394c00728d79._comment diff --git a/doc/forum/git-annex-sync_without_syncing_master/comment_2_585648a04a02760a1f16394c00728d79._comment b/doc/forum/git-annex-sync_without_syncing_master/comment_2_585648a04a02760a1f16394c00728d79._comment new file mode 100644 index 0000000000..4c93dd0f42 --- /dev/null +++ b/doc/forum/git-annex-sync_without_syncing_master/comment_2_585648a04a02760a1f16394c00728d79._comment @@ -0,0 +1,19 @@ +[[!comment format=mdwn + username="jafpoU" + avatar="http://cdn.libravatar.org/avatar/b1016484e481ea844c1fe42ace53e88f" + subject="comment 2" + date="2020-02-04T03:35:48Z" + content=""" +Thank you! + +Just to confirm then, `git-annex-merge` will + +1. union merge any ref with basename `git-annex` onto `git-annex` +2. union merge `synced/$branch` onto `$branch` where `$branch` is the checked out branch + +? + +My goal is for all remotes to have a consistent view of where the annexed files are, without auto-merging any normal branches. + +Is the process you described above the easiest way to achieve this? +"""]]