From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Tue, 01 Jun 2021 23:19:43 GMT
Subject: Re: The git spring cleanup challenge
Message-ID: <60b6c08f75c1c_40442086d@natae.notmuch>
In-Reply-To: <87wnrd6wqj.fsf@osv.gnss.ru>

Sergey Organov wrote:
> Felipe Contreras <felipe.contreras@gmail.com> writes:

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

Can you do `git pull --rebase=merges` for a while?

> [push]
> 	default = simple

This is the default, you don't need it.

> [rerere]
> 	enabled = true
> 	autoupdate = true

We are seeing a pattern here.

> [diff]
> 	algorithm = patience

Does this make a lot of difference?

> [merge]
>         conflictStyle = diff3

Same here.

-- 
Felipe Contreras