Fix a merge conflict without breaking my code | Vovy

Vovy finds every conflict, explains both versions in plain English, merges them with you, and checks the app still builds before committing.

Git says there's a merge conflict, help me fix it

How it works

List the conflicting files: Vovy runs git status and lists every file marked both modified. A conflict means two changes touched the same lines and Git will not guess.
Explain each conflict: Vovy opens each file in Cursor and shows the code between the <<<<<<< and >>>>>>> markers as a side-by-side card: yours versus theirs.
Choose or combine: For each one, you pick keep mine, keep theirs, or both. Vovy writes the merged version and removes the markers.
Make sure it still works: Vovy runs the build and any tests to catch a merge that looks right but breaks the app.
Finish the merge: Vovy stages the files, completes the merge commit, and pushes, with a card summarizing every decision made.

Two branches edited the same lines, or one deleted a file the other changed. It is common when an AI tool and you both edit the same file.

Yes. git merge --abort puts everything back the way it was before you started.

For simple ones, the pull request page has a Resolve conflicts button. Complex conflicts are easier locally.