From fb2e418fa2c01f69e8a014d46b48c41b61485105 Mon Sep 17 00:00:00 2001 From: Lukey Date: Thu, 24 Jun 2021 17:43:36 +0000 Subject: [PATCH] Added a comment --- ...comment_2_4af09b9b24fc39bb702a5db05638a1c1._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/todo/resolve_merge_conflicts_with_smallfiles/comment_2_4af09b9b24fc39bb702a5db05638a1c1._comment diff --git a/doc/todo/resolve_merge_conflicts_with_smallfiles/comment_2_4af09b9b24fc39bb702a5db05638a1c1._comment b/doc/todo/resolve_merge_conflicts_with_smallfiles/comment_2_4af09b9b24fc39bb702a5db05638a1c1._comment new file mode 100644 index 0000000000..aa467a9f1b --- /dev/null +++ b/doc/todo/resolve_merge_conflicts_with_smallfiles/comment_2_4af09b9b24fc39bb702a5db05638a1c1._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="Lukey" + avatar="http://cdn.libravatar.org/avatar/c7c08e2efd29c692cc017c4a4ca3406b" + subject="comment 2" + date="2021-06-24T17:43:36Z" + content=""" +The idea is to solve the conflicts in a similar way to conflicts in annexed files. I.e. by creating two files file.version-a and file.version-b. + + +"""]] -- 2.39.5