Yep they automatically rebase. If that creates conflicts it's marked on the chil... | Hacker News

Hacker Newsnew | past | comments | ask | show | jobs | submit

willhbr 4 months ago | parent | context | favorite | on: jj – the CLI for Jujutsu

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.

Guidelines | FAQ | Lists | API | Security | Legal | Apply to YC | Contact