From 7485c5d60ea035d606c3cddcdd727852bbc191f6 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawn3p4i4lk_zMilvjnJ9sS6g2nerpgz0Fjc" Date: Sun, 23 Mar 2014 22:59:52 +0000 Subject: Added a comment: merge only for metadata branch? --- .../comment_4_5a208ecefd02916cc86e40272923ca3e._comment | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 doc/automatic_conflict_resolution/comment_4_5a208ecefd02916cc86e40272923ca3e._comment diff --git a/doc/automatic_conflict_resolution/comment_4_5a208ecefd02916cc86e40272923ca3e._comment b/doc/automatic_conflict_resolution/comment_4_5a208ecefd02916cc86e40272923ca3e._comment new file mode 100644 index 000000000..00ad51a98 --- /dev/null +++ b/doc/automatic_conflict_resolution/comment_4_5a208ecefd02916cc86e40272923ca3e._comment @@ -0,0 +1,16 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawn3p4i4lk_zMilvjnJ9sS6g2nerpgz0Fjc" + nickname="Matthias" + subject="merge only for metadata branch?" + date="2014-03-23T22:59:52Z" + content=""" +As far as I observed, \"git annex merge\" only merges the \"git-annex\" branch. My wish is to have the conflict resolution from \"git annex sync\" in the \"master\" branch, but no automatic commit, such that the user can verify and possibly correct the merge. The proposed merge could go to the index. Consider the following scenario: + +1. We have repo A, B, and CENTRAL +2. All three start with a root commit in \"master\" branch +3. Then A commits a file \"test.txt\" with content \"a\" and syncs with SERVER +4. Meanwhile, B commits \"test.txt\" with content \"b\" +5. When B tries to sync with SERVER, the proposed conflict resolution having two files \"test.txt-variantXXXX\" and \"test.txt-variantYYYY\" should be staged in the index, but not committed yet. +6. B can now commit a custom merge, e.g. with file content \"ab\". +The point is that I really like the conflict resolution, but still want to force the user to check the result. +"""]] -- cgit v1.2.3