feat(cc): Add ConflictCatcher v1(Python)

Python tool to check for any merge or rebase conflicts between two branches All operations done in temporary git worktrees leaving all dev repo's untouched
2026-06-23 22:36:30 +01:00
parent 0e5670b5e8
commit ce04c91472
3 changed files with 797 additions and 0 deletions
@@ -0,0 +1,31 @@
+# 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
+
+```powershell
+python conflict_catcher.py
+```
+
+Then open the printed local URL. By default it is:
+
+```text
+http://127.0.0.1:8765
+```
+
+## Branch Spec
+
+Use this format:
+
+```text
+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.
+