Tools/cc/README.md

Conflict Catcher

Conflict Catcher is a tiny local web app for checking whether two Git branches are likely to conflict before you run a real merge or rebase.

Run

python conflict_catcher.py

Then open the printed local URL. By default it is:

http://127.0.0.1:8765

Branch Spec

Use this format:

main<develop

The left side is the target/base branch. The right side is the incoming/source branch.

• Merge check: tests whether develop can merge into main.
• Rebase check: tests whether develop can rebase onto main.

The app creates temporary detached worktrees for its dry runs and removes them after each check. It does not merge, rebase, commit, or change your active working tree.