diff options
author | Joey Hess <joeyh@joeyh.name> | 2017-06-01 11:48:45 -0400 |
---|---|---|
committer | Joey Hess <joeyh@joeyh.name> | 2017-06-01 11:48:45 -0400 |
commit | 8fa7c51f198cca8516e5e46de114e7dcd6823767 (patch) | |
tree | 9966030f12d7469614ab2c6b41e55bbd008ffeba | |
parent | 9a9aa7cb83b8338331a1fa61e9b8dd2b21b2c538 (diff) |
comment
-rw-r--r-- | doc/forum/controlling_how___34__git_annex_sync__34___resolves_conflicts/comment_1_48be720ff150112f30273960f677056c._comment | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/doc/forum/controlling_how___34__git_annex_sync__34___resolves_conflicts/comment_1_48be720ff150112f30273960f677056c._comment b/doc/forum/controlling_how___34__git_annex_sync__34___resolves_conflicts/comment_1_48be720ff150112f30273960f677056c._comment new file mode 100644 index 000000000..37a0fa3c7 --- /dev/null +++ b/doc/forum/controlling_how___34__git_annex_sync__34___resolves_conflicts/comment_1_48be720ff150112f30273960f677056c._comment @@ -0,0 +1,20 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 1""" + date="2017-06-01T15:41:33Z" + content=""" +Failing at push seems too late; the user will already have a branch with +the unwanted merge in it at that point and could have additional changes +commited on top of it. And, only allowing fast-forward +merges is probably not what you want either; regular non-conflicting git +merges that are not fast-forwards will almost always be fine. If you did +want to prevent any pushes containing non-fast-forward merges, you could +do it with an `update` hook in the server's git repo. + +There is not currently a way to prevent `git annex sync` from +auto-resolving a merge conflict, but I think there definitely should be. +Something like `git config annex.resolvemerge false`. +And, it probably makes sense to let that be configuration be propigated +to all clones of a repository, by using +`git-annex config annex.resolvemerge false` +"""]] |