# Resolving conflicts

List conflicted files, understand both sides, edit the resolved result, remove conflict markers, test, stage, and continue the merge or rebase.

![Resolving conflicts in Foxora Desktop v5.0.3](/docs/images/v5.0.3/desktop/stage-source-control.webp)

## Where this lives

Open a Git-backed project, then choose **Stage → Source control**.

Source control shows repository status, diffs, staging, commits, branches, worktrees, and conflict state associated with the active project and task.

> **Safety:** Never discard, reset, force-push, or overwrite changes merely to obtain a clean status. Preserve work before recovery operations.

## Steps

1. Open a Git-backed project, then choose **Stage → Source control**.
2. List conflicted files.
3. Understand both sides.
4. Edit the resolved result.
5. Remove conflict markers.
6. Test, stage, and continue the merge or rebase.
7. **Confirm the result.** Run tests, inspect `git status`, and review the final commit diff or pull request.

## Choose the right path

- Use a branch for isolated work.
- Use a worktree when parallel tasks need separate working directories.
- Create a checkpoint before risky conflict resolution.


## Confirm it worked

- Run tests, inspect `git status`, and review the final commit diff or pull request.
- The screen, command, file, run, or destination named in this guide reflects the expected state.