From d2ba1698c9799bc7f4fa18056d00735b7413d1c4 Mon Sep 17 00:00:00 2001 From: Lukey Date: Tue, 22 Jun 2021 18:40:56 +0000 Subject: [PATCH] --- doc/todo/resolve_merge_conflicts_with_smallfiles.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/todo/resolve_merge_conflicts_with_smallfiles.mdwn diff --git a/doc/todo/resolve_merge_conflicts_with_smallfiles.mdwn b/doc/todo/resolve_merge_conflicts_with_smallfiles.mdwn new file mode 100644 index 0000000000..4c9f089b70 --- /dev/null +++ b/doc/todo/resolve_merge_conflicts_with_smallfiles.mdwn @@ -0,0 +1 @@ +Small files might also be used for performance reasons, so there should be an option to also automatically fix merge conflicts for small files in git-annex-sync. -- 2.39.5