Re: [PATCH v3] submodule merge: update conflict error message
Glen Choo <chooglen@google.com> writes:
Show 42 quoted lines
> Hi! I have a suggestion for the output text; I haven't looked closely at
> the code changes.
>
>> If git detects a possible merge resolution, the following is printed:
>>
>> --------
>>
>> Failed to merge submodule sub, but a possible merge resolution exists:
>> <commit> Merge branch '<branch1>' into <branch2>
>>
>>
>> If this is correct simply add it to the index for example
>> by using:
>>
>> git update-index --cacheinfo 160000 <commit> "<submodule>"
>>
>> which will accept this suggestion.
>>
>> CONFLICT (submodule): Merge conflict in <submodule>
>> Recursive merging with submodules is currently not supported.
>> To manually complete the merge:
>> - go to submodule (<submodule>), and either update the submodule to a possible commit above or merge commit <commit>
>> - come back to superproject, and `git add <submodule>` to record the above merge
>> - resolve any other conflicts in the superproject
>> - commit the resulting index in the superproject
>> Automatic merge failed; fix conflicts and then commit the result.
>>
>> --------
>
> I'm hesitant to recommend a plumbing command like "git update-index" to
> the user, especially if the user is one who needs help resolving a
> submodule merge conflict. I also believe this would be the first time we
> recommend "git update-index".
>
> To do this using only porcelain commands, maybe:
>
> git -C <submodule> checkout <commit> &&
> git add <submodule>
>
> (Though this might need to be broken up into two commands because I'm
> not sure if we ever include "&&" in a help message. I'm guessing we
> don't for portability reasons?)
Gah, ignore everything I said here. I should have read the thread
closer:
- The update-index suggestion didn't come from you; it had already
existed prior to this series.
- Both Philppe and Elijah have already suggested the exact same thing.
Glen Choo <chooglen@google.com>