From 7ad95210d19bf21d76da7a76142876fc9a537045 Mon Sep 17 00:00:00 2001 From: Ilya_Shlyakhter Date: Thu, 24 Jun 2021 18:03:40 +0000 Subject: [PATCH] Added a comment: resolving merge conflicts --- ...t_3_9098b3f365af6fe0692cf02b31fd6dee._comment | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 doc/todo/resolve_merge_conflicts_with_smallfiles/comment_3_9098b3f365af6fe0692cf02b31fd6dee._comment diff --git a/doc/todo/resolve_merge_conflicts_with_smallfiles/comment_3_9098b3f365af6fe0692cf02b31fd6dee._comment b/doc/todo/resolve_merge_conflicts_with_smallfiles/comment_3_9098b3f365af6fe0692cf02b31fd6dee._comment new file mode 100644 index 0000000000..66d5ecd860 --- /dev/null +++ b/doc/todo/resolve_merge_conflicts_with_smallfiles/comment_3_9098b3f365af6fe0692cf02b31fd6dee._comment @@ -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? + + + +"""]]