conflict-resolver

This repository contains the VS Code extension for the main project, GitPilot. You can find the main repository here: https://github.com/InflixOP/GitPilot

WInte.r is a Java framework for end-to-end data integration. The WInte.r framework implements well-known methods for data pre-processing, schema matching, identity resolution, data fusion, and result evaluation.

GitPilot is an intelligent AI-powered Git assistant that bridges the gap between natural language and Git commands. It's designed to make Git more accessible and efficient by allowing developers to express their intentions in plain English, while providing context-aware suggestions and safety checks.

Three-way AST hunk alignment and non-overlapping block conflict resolution for Git cherry-pick and rebase patches

Three-way AST hunk alignment and non-overlapping block conflict resolution for Git cherry-pick and rebase patches

Mod load-order manager and conflict resolver for Ostranauts. Suggests a valid load order, merges colliding mods into a compatibility patch, and validates against the game's own schemas.

The Schedule Planner is designed to help students efficiently plan their semester schedules

🔞 ComfyUI 东亚人像与剧情提示词套件｜v1.2.0 · 4 个节点 · 20 槽位外部覆盖 · 情境亲和矩阵 · 冲突消解 · Diagnostics 2.0 · 77 presets

Merge files that were rejected during package upgrades

Java Conflict Resolver for Nextcloud desktop client.

A plugin for JetBrains-based IDEs that resolves conflicts using an AI agent

⚡ Aplicație Web Python (Flask) pentru generarea, rezolvarea conflictelor și sincronizarea orarului universitar dual către cloud și telefon. Realizat cu asistență AI.

A simple web-based tool to resolve Git merge conflicts directly in your browser.

Compare password manager files (CSV) exports side-by-side, resolve conflicts, and export a clean unified list.