On Sat, Jan 22, 2022 at 10:56 PM Elijah Newren via GitGitGadget <gitgitgadget@xxxxxxxxx> wrote: > Updates since v2 (thanks to Christian, Dscho, Ramsay, and René for > suggestions and comments on v2): > > * Significant changes to output format: > * Flags no longer take a filename for additional output; they write to > stdout instead. > * More information included by default when there are conflicts (no need > to request it with additional flags, instead flags can be used to > suppress it). > * Provide (mode, oid, stage, file) tuples -- i.e. ls-files -u style of > information -- when there are conflicts. Add a flag to only list > conflicted files if that's preferred. The above changes seem good to me. > * Much more thorough manual for git-merge-tree.txt > * Renamed option from --real to --write-tree > * Accept an optional --trivial-merge option to get old style merge-tree > behavior > * Allow both --write-tree and --trivial-merge to be omitted since we can > deduce which from number of arguments I still think that it might be simpler and cleaner to leave 'git merge-tree' alone for now, and just add a new command named for example 'git write-merge-tree'. Later we can always add flags to 'git merge-tree' or add 'git trivial-merge-tree' as an alias for 'git merge-tree', and eventually slowly switch 'git merge-tree' to mean only 'git write-merge-tree' if that's where we want to go. > * Document exit code when the merge cannot be run (so we can distinguish > other error cases from conflicts) > * testcase cleanups: test_tick, early skip of test when using recursive > backend, variable renames, etc. > * various minor code cleanups > * Add a new --allow-unrelated-histories option (with same meaning as the > one used in git merge) The above changes seem good to me too. > Stuff intentionally NOT included, but which others seemed to feel strongly > about; they'd need to convince me more on these: > > * Any form of diff output[1] It's not a big issue for me to not include them right now as long as it's possible to add cli options later that add them. The reason is that I think in many cases when there are conflicts, the conflicts will be small and the user will want to see them. So it would be simpler to just have an option to show any conflict right away, rather than have the user launch another command (a diff-tree against which tree and with which options?). Thanks for working on this anyway!
