Hi! During DebConf25 some of us were discussing some VCS related topics in a table in Centre-Vie, AFAIR (but I might easily misrecall at this point, sorry about that!) there were at least Timo, Tollef and Helmut (and some other people which I don't recall!).
And I brought up an alternative VCS, which could use git as backing store, but with new workflow features, such as rebases that preserve conflicts (and can then be resolved later on), but could not recall its name. At the time I think I mentioned I'd look it up and bring it up later. When I came back home I did that. :) The name is «jujutsu», and its workflow can be seen described, for example, in these two presentations: https://www.youtube.com/watch?v=LV0JzI8IcCY https://www.youtube.com/watch?v=bx_LGilOuE4 There's currently an RFP for it at <https://bugs.debian.org/1061772>. Regards, Guillem
