Re: Improving merge of tricky conflicts

> On Thu, Jul 23, 2020 at 12:20:46AM +0300, Sergey Organov wrote:
>
>> >> Is there 'git merge' command-line option for that? I failed to find one.
>> >
>> > There isn't, unless you count
>> >
>> >     $ git -c merge.conflictstyle=diff3 merge side-branch
>> >
>> > as a "command line option" (which may technically is).
>> 
>> Yeah, I thought of maybe making an alias for that, so apparently I do
>> count it as command line option, thanks!
>
> You can also do it after "git merge" aborts with conflicts by running:
>
>   git checkout --conflict=diff3 my-file
>
> but do note that it will check out from the index, overwriting any
> resolution you've already done in that file.