Re: [PATCH v2 0/3] Add GIT_TEST_MULTI_PACK_INDEX environment variable

From: Junio C Hamano <gitster@pobox.com>
Date: Oct 22, 2018, 01:41 UTC
Message-ID: <xmqqy3aqycz8.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <38aff549-9582-9879-9b3d-81cf5b1c3e24@gmail.com>

Derrick Stolee <stolee@gmail.com> writes:

>> base-commit: 5a0cc8aca797dbd7d2be3b67458ff880ed45cddf
> I should explicitly mention that this base commit is different as
> otherwise I will conflict with ds/multi-pack-verify with the new
> prototype in midx.h.

There indeed is a tiny textual conflict, and in this case it may not matter that much, but please make it a habit to refrain from doing such a rebase in general. It makes it impossible to compare the new round in the same context that the old round was inspected and has been tested, unless such a textual conflict avoidance is undone.

A good rule of thumb is to build on the same base, attempt a trial merge to 'master' (and 'next' and 'pu' if you are inclined to), and see how bad a conflict you get. And if the conflict is something you can trivially resolve and the resolution would bring the code to the same state as you would get if you rebased, then you are better off not rebasing and let the maintainer deal with the merge. You cannot control what other contributor would do to the code while you are working on it, so having to resolve these tiny textual conflicts is not "an unnecessary added burden" to me (having to backport to see the new round in the same context as the old round is, though).

Of course, if you truly depend on some recent addition that happend since your old base, please do not hesitate to rebase.

Thanks.