Comment by willhbr

Yep they automatically rebase. If that creates conflicts it's marked on the child commit and you can swap over and resolve it any time.