On 28/02/2018 21:25, Igor Djordjevic wrote: > > But U1' and U2' are really to be expected to stay the same in > non-interactive rebase case only... Just to rephrase to "could be expected" here, meaning still not necessarily in this case, either - I`ve just witnessed non-interactive rebase Johannes previously described[1], merge with `-s ours` (dropping B* patches), plus B1 cherry-picked between X1..X2, eventually coming up with different U1' and U2', too (which would produce a wrong end result, if continued). But I guess this should go to the "complex history" pile, good thing still being that diff safety check between U1' and U2' works as expected, thus automatic merge rebase can be aborted and command given back to the user for closer inspection. [1] https://public-inbox.org/git/nycvar.QRO.7.76.6.1802272330290.56@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx/
