On 29/09/2025 06:22, Zhenlei Huang wrote:
I have ever encountered merge conflicts when doing MFC and it is painful to resolve the conflicts multiple times when MFCing to older branches.
I always enable Git rerere and (almost) never regret it. -- Andriy Gapon
