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
