> The user probably > wants to merge the submodules, but they can choose however they want to > resolve the merge conflict It sounds like I should reword "merge conflicted submodules" to "resolve conflicted submodules". That should cover those 10% cases. I would prefer to find a generic, but still helpful message that doesn't require going into the advice() API or require some config change On Wed, Jun 8, 2022 at 10:35 AM Glen Choo <chooglen@xxxxxxxxxx> wrote: > > Calvin Wan <calvinwan@xxxxxxxxxx> writes: > > >> Hmph. Is 1. necessary? > > > > I just tested it and it is not, so I do agree recommending to abort the > > merge is unnecessary/bad advice. How does this sound? > > > > Failed to merge submodule <submodule> > > CONFLICT (submodule): Merge conflict in <submodule> > > Automatic merge failed; recursive merging with submodules is currently > > not supported. To manually merge, merge conflicted submodules first > > before merging the superproject. > > This message sounds ok to me, since this is probably what the user wants > 90% of the time. Since we don't abort the merge, this just a 'regular' > merge conflict resolution (albeit with submodules). The user probably > wants to merge the submodules, but they can choose however they want to > resolve the merge conflict, e.g. maybe they'd prefer to just pick one > side (or even more exotically, a different commit altogether.) > > An improvement for that other 10% would be to print this help message > with the advice() API so that users can turn it off if they don't find > it helpful. Or maybe it's confusing to some new users who use a > different merging workflow and so an admin might turn off this advice > for them.
