Phillip Wood <phillip.wood123@xxxxxxxxx> writes: >>> Do you know why -m and -i aren't affected? >> >> I had to look, but I believe the answer is because they use the >> sequencer, and the sequencer calls git merge-recursive as a separate >> process, and so the writing of the tree is only done in a subprocess, >> which can't persist state. > > The sequencer has been running in a single process for a while now. We > do fork for 'git merge' sometimes when processing 'merge' commands but > 'pick' commands are all done in a single process by calling > do_recursive_merge(). > > Best Wishes > > Phillip > >> Should we move the merge-recursive code into the main process, we'll >> likely have the same problem there. So we actually have the same issue already?
