summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar pgunn01@39c747700d10e9e9e4557a407cba2f88c22b202d <pgunn01@web>2017-05-30 22:21:47 +0000
committerGravatar admin <admin@branchable.com>2017-05-30 22:21:47 +0000
commitcb7257750ea1f1fae0d6eb7a933fe816eb18e680 (patch)
tree4ef92158d5e9044672825bc3ff5c22afc0cc4e86
parentc2f804b9b2d80af91bac1d0b074c664efcf8da97 (diff)
-rw-r--r--doc/forum/controlling_how___34__git_annex_sync__34___resolves_conflicts.mdwn6
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/forum/controlling_how___34__git_annex_sync__34___resolves_conflicts.mdwn b/doc/forum/controlling_how___34__git_annex_sync__34___resolves_conflicts.mdwn
new file mode 100644
index 000000000..5c9b8f511
--- /dev/null
+++ b/doc/forum/controlling_how___34__git_annex_sync__34___resolves_conflicts.mdwn
@@ -0,0 +1,6 @@
+Hi,
+I'd like to know if there's an easy way to control how "git annex sync" resolves conflicts. I use git annex (with wrappers I have written) to manage repos full of debs. The debs themselves never conflict, but the metadata does. So far this works great if people check out the repo, add some debs in, regenerate the metadata from the debs (using external scripts), and then shove it back into the central repo. Many people can do this for our shared project.
+
+This doesn't work well if two people have the repo checked out at the same time; when they "git annex sync" to shove the data back up, annex detects the merge conflict in the metadata and renames the files.
+
+What I'd like is a flag saying that while pushing the changes upstream, the sync will only perform fast-forwards and fail if that doesn't work so my wrappers can abort the user's workflow. Any advice would be appreciated.