• arielby has quit
      • arielby joined the channel
      • Engelchen joined the channel
      • Aaronepower joined the channel
      • eddyb
        maikklein-M: rebase and merge can both succeed for the same situation but that is not guaranteed
      • merge combines final state, rebase replays individual commits
      • so rebase can succeed alone if individual steps are easier to piece together, or fail alone if it goes back and forth and the rebase doesn't see the intermediary conflict
      • varkor has quit
      • maikklein-M
        I see, that makes sense.
      • Ericson2314 has quit