Subject: Re: The git spring cleanup challenge

From: Sergey Organov <[email-masked]>
Date: Wed, 02 Jun 2021 01:33:40 +0300

Felipe Contreras <[email-masked]> writes:

> Hello,

[...]

> These are the configurations I've chosen:
>
>   [merge]
>     conflictstyle = diff3
>   [sendemail]
>     smtpserver = /usr/bin/msmtp
>

[pull]
	rebase = merges
[push]
	default = simple
[rerere]
	enabled = true
	autoupdate = true
[diff]
	algorithm = patience
[merge]
        conflictStyle = diff3

-- Sergey Organov