Nguyen Thai Ngoc Duy <pclouds@gmail.com> writes:

quoted text
> I wanted to update nd/setup topic, but found nd/root-git was merged in
> between its two parts, which resulted in non-trivial conflicts in the
> end.

I am not quite sure what you want me to do.  Replacing these named commits
in place (meaning, the merge with nd/root-git to adjust the later parts
that depend on that fix is reproduced while rebuilding the topic) has some
silly conflicts, and rebuilding the whole series without the merge but
with the named commits replaced has different conflicts.

As the fix of nd/root-git is already in 'master', it might make more sense
to apply the whole series rebased to the newer codebase instead of keeping
the same fork point as the older series.  That also removes the worries
for you about having to send conflict resolutions, no?

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html