tools/batch-rebase: Fix content of .batch-rebase-state when a conflict occured

FIX

Ensure the state is properly updated with the information from the conflict before being dumped to disk.