Documentationv1.4.0

scan

Predictive conflict detection before the merge happens.

scan

The scan command is your early-warning system. By leveraging git merge-tree, it simulates a merge between your current HEAD and a target branch to find potential overlaps before you even run a merge command.

bash

$gitresolve scan --target main

Scanning for potential conflicts against main...

Potential conflicts detected: 2 files/blocks.

⚠ Conflict (modify/modify): internal/db/schema.go

⚠ Conflict (add/add): config/default.yaml

--target <branch>

The target branch to compare against (defaults to main).

--depth <int>

How many commits deep to look for potential diverging paths.

--ignore-whitespace

Skip conflicts that are purely whitespace changes.