From: Kristoffer Haugsbakk <kristofferhaugsbakk@fastmail.com>
Date: Thu, 03 Oct 2024 20:15:21 GMT
Subject: Re: Request for adding a "one-shot" rebase strategy where conflicts are only resolved once
Message-ID: <f2ae51a2-95e9-43d4-beba-774d05bfc3e9@app.fastmail.com>
In-Reply-To: <CAD9n_qgBPDQKF=ZEQ6SWvDCmcUXZvz33zSoHFQSwHmQPWS4z_Q@mail.gmail.com>

On Thu, Oct 3, 2024, at 21:06, Alireza wrote:
> Sometimes a clean merge is possible but with a rebase, in-between
> commits may raise conflicts in which case a conflict must be resolved
> for each commit individually, which is not quite productive and at the
> end wouldn't add so much in how the resulting history looks like.
>
> With a "one-shot" rebase, a conflict (if any) is made based on the
> latest revision, then in-between commits approximated based on that
> resolution. This way the history can be roughly preserved with the
> same amount of effort while still using a rebase rather than merge.

How would this compare to using git-rerere(1)?

-- 
Kristoffer Haugsbakk