mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

comment

Browse source
This commit is contained in:
Joey Hess 2017-06-01 11:48:45 -04:00
parent bb060f000f
commit 650b3fd4c7
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
doc/forum/controlling_how___34__git_annex_sync__34___resolves_conflicts/comment_1_48be720ff150112f30273960f677056c._comment Normal file
View file

@ -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`
"""]]