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.
74 karma · joined July 16, 2023
I focussed on how it works since that's what I set out to understand myself after seeing effects mentioned a few times
I tried to write a websocket client: https://willhbr.net/2023/08/23/the-five-stages-of-swift-on-l... Then tried again 2 years later: https://willhbr.net/2025/10/13/the-6-2nd-stage-of-swift-on-l...
My intent was to capture the shade of the non-content area in the window.
[0]: https://willhbr.net/2024/01/18/the-code-config-continuum/