Add integration test for sync with merge conflicts #23
Description
Add a test in crates/rung-cli/tests/integration.rs that creates conflicting commits, runs rung sync, and verifies the --continue flow works.
{{ message }}
Add a test in crates/rung-cli/tests/integration.rs that creates conflicting commits, runs rung sync, and verifies the --continue flow works.