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

Added a comment: resolving merge conflicts

Browse source
This commit is contained in:
Ilya_Shlyakhter 2021-06-24 18:03:40 +00:00 committed by admin
parent fb2e418fa2
commit 7ad95210d1
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
doc/todo/resolve_merge_conflicts_with_smallfiles/comment_3_9098b3f365af6fe0692cf02b31fd6dee._comment Normal file
View file

@ -0,0 +1,16 @@
[[!comment format=mdwn
username="Ilya_Shlyakhter"
avatar="http://cdn.libravatar.org/avatar/1647044369aa7747829c38b9dcc84df0"
subject="resolving merge conflicts"
date="2021-06-24T18:03:40Z"
content="""
\"Small files\" here means \"non-annexed files\", right?
Whether a file is annexed, and whether its merge conflicts should be auto-resolved by creating two files `file.version-a` and `file.version-b`, seem like orthogonal things.
One might check small binary files directly into git, and one might annex source code files e.g. just for the simplicity of annexing everything (as [[DataLad|projects/datalad]] does or at least used to).
So, maybe, `.gitattributes` should control which files' merge conflicts get auto-resolved?
"""]]