| commit | a4040cfa35d8781df3e994380d1b559be8b22bd2 | |
| author | Elijah Newren <newren@gmail.com> | |
| Sat, 18 Jun 2022 00:20:51 +0000 (18 00:20 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 22 Jun 2022 23:10:06 +0000 (22 16:10 -0700) | ||
| tree | d6b8ebcb556a2311f185ee2c8878eaeea59baf17 | treesnapshot (tar.gz zip) |
| parent | fae26ce79cad6d290e296e40f2d46eb783e91110 | commitdiff |
merge-ort: remove command-line-centric submodule message from merge-ort
There was one case in merge-ort that would call path_msg() multiple
times for the same logical conflict, and it was in order to give advice
about how to resolve a conflict. This advice does not make as much
sense with remerge-diff, or with merge-tree being invoked by a GitHub
GUI for resolution of messages, and is making it hard to provide
which-logical-conflict-affects-which-paths information in a machine
parseable way to a higher level caller of merge-tree. Let's simply
remove this informational message.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
There was one case in merge-ort that would call path_msg() multiple
times for the same logical conflict, and it was in order to give advice
about how to resolve a conflict. This advice does not make as much
sense with remerge-diff, or with merge-tree being invoked by a GitHub
GUI for resolution of messages, and is making it hard to provide
which-logical-conflict-affects-which-paths information in a machine
parseable way to a higher level caller of merge-tree. Let's simply
remove this informational message.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| merge-ort.c | diffblobblamehistory | |
| t/t6437-submodule-merge.sh | diffblobblamehistory |