Re: git-rebase-walk

From: Nico Williams <nico@cryptonector.com>
Date: Oct 1, 2026, 21:35 UTC
Message-ID: <ar7SG6UKJTu1EmJr@ubby>
In-Reply-To: <ar7KDbV2ra7Rtzl6@ubby>

On Thu, Oct 01, 2026 at 04:01:01PM -0500, Nico Williams wrote:

>                                       though.. it's fairly obvious

Concisely: repeatedly try to rebase to the new base, then fall back
on bisection to find the upstream commit that causes conflicts.

`bisect-rebase` is kind of a misnomer, because the best-case behavior is O(1), and worst-case is O(N log N) when _every_ upstream commit introduces conflicts, whereas one would expect O(log N). Still, it's a reasonable name given the intent.

Nico