Sergey Organov wrote: > Felipe Contreras <felipe.contreras@xxxxxxxxx> writes: > > > 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? > > I never use 'git pull' for merging, and all the time with rebasing, so > what's the point? I mean, whenever I do 'git pull' I mean 'git pull > --rebase', and whenever I need to merge, I exclusively use'git merge'. So you can remove that configuration. And afterwareds set pull.rebase=true so you don't need to specify --rebase. > >> [rerere] > >> enabled = true > >> autoupdate = true > > > > We are seeing a pattern here. > > > >> [diff] > >> algorithm = patience > > > > Does this make a lot of difference? > > As far as I recall, I had some mismerges long time ago that this setting > affected positively, so I've tweaked it. Try running without it for a while. If you see issues then parhaps it's an indication that patience is a better default algorithm. Cheers. -- Felipe Contreras
