lkml.org 
[lkml]   [2022]   [Mar]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [PATCH] docs: Add a document on how to fix a messy diffstat
From
On 26/03/22 04.58, Jonathan Corbet wrote:
> +So what is to be done? The best response when confronted with this
> +situation is to indeed to a merge, but to do it privately, as if it were
> +the source of shame. Create a new, throwaway branch and do the merge
> +there::
> +
> + ... vM --- vN-rc1 --- vN-rc2 --- vN-rc3 --- ... --- vN-rc7 --- vN
> + | | |
> + | +-- c1 --- c2 --- ... --- cN |
> + | / | |
> + +-- x1 --- x2 --- x3 +------------+-- TEMP
> +

A merge from the mainline, right? Or merge from what?

--
An old man doll... just what I always wanted! - Clara

\
 
 \ /
  Last update: 2022-03-27 08:18    [W:0.044 / U:0.808 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site