It stops and asks you to resolve it and then you'd use the regular git commands ...

		_ikke_ on Aug 12, 2023 \| parent \| context \| favorite \| on: Pijul: Version-Control Post-Git [video] It stops and asks you to resolve it and then you'd use the regular git commands to continue that operation (like git rebase --continue)