From 65911ac280a0f72c6c48c88472e7bc83c7ad1614 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 25 Dec 2025 07:06:15 +0000 Subject: [PATCH] Update README to reference the new roadmap Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com> --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index d6d79e0..e355e4e 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,14 @@ can extend the UI palette without touching the core code. - Simple merge algorithm utilities in `wizardmerge.algo` - Helper scripts for environment setup and running the app +## Roadmap +See [ROADMAP.md](ROADMAP.md) for our vision and development plan to make resolving merge conflicts easier. The roadmap covers: +- Enhanced merge algorithms (three-way merge, conflict detection) +- Smart semantic merging for different file types +- Advanced visualization and UI improvements +- Git workflow integration +- AI-assisted conflict resolution + ## Getting Started 1. Create a virtual environment and install dependencies: ```sh