Bug: git sync results in rebase conflict instead of skipping merge commits
Bug: git sync results in rebase conflict instead of skipping merge commits: a task in LegoFlow-SWE (Harbor dataset). When running git sync (without the --merge flag), the command should skip any commits that would result in merge conflicts and continue syncing the remaining commits. However, when…
The task
When running `git sync` (without the `--merge` flag), the command should skip any commits that would result in merge conflicts and continue syncing the remaining commits. However, when the commit stack includes merge commits (commits with multiple parents), `git sync` fails to detect that an on-disk rebase would be…
Part of Lego-X/LegoFlow-SWE.