Sergey Organov wrote: > Felipe Contreras <felipe.contreras@xxxxxxxxx> 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
