Junio C Hamano wrote: > Thomas Rast <trast@xxxxxxxxxxxxxxx> writes: [...] > > Should not be doing an Octopus. [...] > > Shouldn't it either really clean up, or really > > leave the repo in a conflicted merge state? [...] > Your analysis is correct --- this has been the correct/established > behaviour of Octopus from day one. Including not cleaning up the half-merged state? If the answer is "yes", then so be it, merge-octopus has been on this project longer than I have ;-) However, > Run "git reset --hard" after that, perhaps. wasn't immediately obvious to the end-user (jammyd in this case), which started the discussion. -- Thomas Rast trast@xxxxxxxxxxxxxxx
Attachment:
signature.asc
Description: This is a digitally signed message part.
