On Mon, Sep 30, 2024 at 11:57:19AM -0700, Junio C Hamano wrote: > shejialuo <shejialuo@xxxxxxxxx> writes: > > > Because I do not sync the upstream for a long time. For this series, I > > sync the latest upstream and generate the patch, it is based on > > > > 3857aae53f (Git 2.47-rc0, 2024-09-25) > > Does this help to reduce conflicts when merging the topic to say > 'next' or 'seen'? If so, such a rebase and noting it in the cover > letter message, like you just did, is very much appreciated. > > If not, please don't ;-). > Actually, I am sure that there is no conflicts after squashing the following two patches. <xmqqle0gzdyh.fsf_-_@gitster.g> <xmqqbk1cz69c.fsf@gitster.g> The reason why I just sync the upstream is that the build system (such as warning about unused parameters) and CIs are all changed. I will remember this. Thanks, Jialuo
