summaryrefslogtreecommitdiff
path: root/doc/automatic_conflict_resolution/comment_2_0a8ea42764dde1a33d2112197b961c51._comment
diff options
context:
space:
mode:
Diffstat (limited to 'doc/automatic_conflict_resolution/comment_2_0a8ea42764dde1a33d2112197b961c51._comment')
-rw-r--r--doc/automatic_conflict_resolution/comment_2_0a8ea42764dde1a33d2112197b961c51._comment8
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/automatic_conflict_resolution/comment_2_0a8ea42764dde1a33d2112197b961c51._comment b/doc/automatic_conflict_resolution/comment_2_0a8ea42764dde1a33d2112197b961c51._comment
new file mode 100644
index 000000000..8c50ec4e2
--- /dev/null
+++ b/doc/automatic_conflict_resolution/comment_2_0a8ea42764dde1a33d2112197b961c51._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawn3p4i4lk_zMilvjnJ9sS6g2nerpgz0Fjc"
+ nickname="Matthias"
+ subject="Use automatic merge without syncing"
+ date="2014-03-20T10:03:41Z"
+ content="""
+Is there a possibility to use the automatic merge logic without using \"git annex sync\"? I don't want to have the \"synced\"-branches, but the auto-conflict-resolution is very nice.
+"""]]