End-user collaboration library via 3-way xml merging and hg dvcs under the hood

Conflict Resolution Web Application for government organisations and businesses

Conflict Resolution Web Application for government organisations and businesses

Automation labeling and comment in PR Conflict

This repository serves as a testbed for learning and practicing Git and GitHub workflows.

GitPod helper command for project-specific environment variables.

(ML) model for computing conflict risk from climate, environmental, and societal drivers.

A tool to simplify merge conflicts in Neovim

Empowering Rational Discourse and Decision-Making: The Idea Stock Exchange is a groundbreaking platform designed to revolutionize how we engage in political and societal debates. At its core, this project harnesses the power of collective intelligence, utilizing a structured framework for automated conflict resolution and cost-benefit analysis.

Command Line tool that performs git merge or pull but additionally checks for and resolves conflicts in an Xcode project's info.plist files, specifically conflicts with the CFBundleVersion value.

A Gradle Plugin for resolving AndroidManifest.xml merge conflicts.

The objective of this project is to develop a predictive model to determine the likelihood of conflicts or civil unrest in a specific region or country.

🌍 Israel-Palestine Conflict Dashboard: Crafted a comprehensive Power BI dashboard shedding light on the intricate dynamics of the Israel-Palestine conflict. Meticulously curated data visualisations offer a nuanced understanding, encompassing historical context, geopolitical trends, and humanitarian impact.

A GitHub skill-up for lesson Maintainers and developers

The intuitive UI for IntelliMerge, where the developers can merge code and resolve conflicts.

Making my local storage of useful AD Scripts available to everyone.

A python tool which helps with changelog/release file conflicts with git

Github action for tracking conflicts between open pull requests