Re: [PATCH v4 0/8] Reimplement rebase --merge via interactive machinery

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Junio,

On Fri, 18 Jan 2019, Junio C Hamano wrote:

> Johannes Schindelin <Johannes.Schindelin@xxxxxx> writes:
> 
> > On Fri, 18 Jan 2019, Junio C Hamano wrote:
> >
> >> Johannes Schindelin <Johannes.Schindelin@xxxxxx> writes:
> >> 
> >> > I am about to submit a new iteration of my patch series, would it
> >> > be too much trouble for you to rebase on top? If it would be, let
> >> > me know, then I will rebase on top of yours.
> >> 
> >> Or both of you keep the topics as-is and self-consistent, and let the
> >> rerere machinery to squash it in when the two topics gets merged.
> >
> > With all the experience I have with rerere, I don't trust it.
> 
> FWIW, I trust it once I got right resolution better than randomly
> rebased resubmission that needs to be re-reviewed afresh.

Once again, our experiences teach us diametrically opposed things. I
definitely trust my rebased version more than your rerere-affected
resolution.

Ciao,
Dscho



[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux