On Mon, Dec 7, 2020 at 2:55 PM Junio C Hamano <gitster@xxxxxxxxx> wrote: > > Felipe Contreras <felipe.contreras@xxxxxxxxx> writes: > > > It is not a complete solution, but should improve the current situation. > > > > Since v2: > > > > 1. The warning is updated to say "a merge, a rebase, or a fast-forward" > > 2. A suggestion 'If unsure, run "git pull --merge".' is removed > > 3. A new REBASE_DEFAULT is introduced > > 4. Tests are revamped using helpers > > 5. The logic of --merge and --ff-only is updated so one can override the other > > 6. A bunch of commit messages are updated > > 7. A memory inconsistency is fixed > > On what base has this series been built? Applying to 'master' seems > to stop at the "refactor fast-forward check" step. Ninth batch. The 'pb/pull-rebase-recurse-submodules' merge is the one causing the conflicts (I think). -- Felipe Contreras
