reject

diff --git a/doc/todo/Extend_merge_conflict_resolution_to_git_conflicts.mdwn b/doc/todo/Extend_merge_conflict_resolution_to_git_conflicts.mdwn
index 4487ae032b414bba392124d8d59a1ddbf26bd131..67e95edaa7e4e21bdf76702d3e1a78b8d4a724a5 100644 (file)
--- a/doc/todo/Extend_merge_conflict_resolution_to_git_conflicts.mdwn
+++ b/doc/todo/Extend_merge_conflict_resolution_to_git_conflicts.mdwn
@@ -9,3 +9,5 @@ To not confuse users, it could be opt-in (`git annex --set annex.resolvegitmerge
 On conflict, it would remove the conflicting file and instead create two versions with suffixes either like annexed files or better the commit hash and/or date.
 
 Submodule conflicts can't be resolved like this, in that case I would use the most recent commit of the two in question.
+
+> [[rejected|done]] --[[Joey]]

diff --git a/doc/todo/Extend_merge_conflict_resolution_to_git_conflicts/comment_1_c08e7f51503f103c447064a01b085783._comment b/doc/todo/Extend_merge_conflict_resolution_to_git_conflicts/comment_1_c08e7f51503f103c447064a01b085783._comment
new file mode 100644 (file)
index 0000000..887b4d7
--- /dev/null
+++ b/doc/todo/Extend_merge_conflict_resolution_to_git_conflicts/comment_1_c08e7f51503f103c447064a01b085783._comment
@@ -0,0 +1,19 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 1"""
+ date="2023-06-05T18:49:43Z"
+ content="""
+I think this would violate least surprise. Users expect git-annex
+to behave like git, and that means merge conflicts like git handles them,
+when the files are text files tracked by git.
+
+Consider that, if the file is a config file, applying git-annex's
+resolvemerge to it would make 2 files with different names be in the
+repository. So the config file would stop taking effect for whatever it was
+supposed to configure. It would be easy for the user to miss that, because
+the repository would not be left in a conflicted state.
+
+When you check a file into git rather than git-annex, you are
+choosing to have git manage that file normally. If you want the git-annex
+behavior, you can check the file into git-annex.
+"""]]