From 574196b8875fd07a9e055ed5e68d14a4a1d0b27b Mon Sep 17 00:00:00 2001 From: nobodyinperson Date: Tue, 21 Nov 2023 20:20:14 +0000 Subject: [PATCH] Added a comment --- .../comment_2_22701b82e8d53acff66ddea5bf9448bf._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/bugs/How_to_git_union-merge__63__/comment_2_22701b82e8d53acff66ddea5bf9448bf._comment diff --git a/doc/bugs/How_to_git_union-merge__63__/comment_2_22701b82e8d53acff66ddea5bf9448bf._comment b/doc/bugs/How_to_git_union-merge__63__/comment_2_22701b82e8d53acff66ddea5bf9448bf._comment new file mode 100644 index 0000000000..63edd6f659 --- /dev/null +++ b/doc/bugs/How_to_git_union-merge__63__/comment_2_22701b82e8d53acff66ddea5bf9448bf._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="nobodyinperson" + avatar="http://cdn.libravatar.org/avatar/736a41cd4988ede057bae805d000f4f5" + subject="comment 2" + date="2023-11-21T20:20:13Z" + content=""" +It sounds promising as an automatic merge conflict resolver that I'd like to fall back to for non-annexed file conflicts. I don't really know how do achieve that manually. If it's easily possible in another way, I'll try that. +"""]]