On Sat, Jun 3, 2023 at 3:42 AM Junio C Hamano <gitster@xxxxxxxxx> wrote: > > Christian Couder <christian.couder@xxxxxxxxx> writes: > > > # Changes between v2 and v3 > > > > Thanks to Elijah and Junio for their suggestions on the previous > > version! The very few and minor changes compared to v2 are: > > > > * The patch series was rebased onto master at v2.41.0. > > It is good to say this than not to say it, but without "in order to > ..." it does not help very much. I was hoping "by rebasing, we can > avoid unnecessary conflicts with what happened in the upstream in > the meantime, namely, modify-remove conflict of X is now gone" or > something like that. The reason was because v2 had conflicts with a patch series from Elijah that changed "#include ...". You asked me to squash a small patch that fixed it, and I did squash it into v3, but I thought it was safer to also rebase.
