Conflict GitHub Repositories

No conflicts for your bin dependencies

Easy terminal-native 3-way git mergetool vim-like workflow

A Gradle Plugin for resolving AndroidManifest.xml merge conflicts.

An attempt to map the areas with active conflict in Ukraine using twitter data and NLP.

Resolve conflicts with minimum pain.

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

Merge multiple Tailwind CSS classes and automatically resolves conflicts between them without headaches ! First-class support for Laravel ✨

The first and only complete UI framework for Discord

This repo scrapes Oryxspioenkop (daily) to document and visualize equipment losses in the Russia-Ukraine war. https://www.oryxspioenkop.com/2022/02/attack-on-europe-documenting-equipment.html

Identify which process is using a specific port.

A powerful, offline-first data synchronization engine for Flutter and Dart, featuring relational data support, real-time queries, and intelligent conflict resolution.

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

A graph-based refactoring-aware three-way merging tool for Java programs.

When copying or moving files, it's common for operating systems to automatically add an increment or 'copy' to duplicate file names. This does that for Node.js applications, with automatic platform detection and support for Linux, MacOs, and Windows conventions.

A library to map match and help tackle the problem of overlapping/intersecting road and building footprint that arises in the process of map making

Structuring the data footprint of the Iranian aerial warfare attacks on Israel, the US, and others from 2024-present.

头视图+标题栏+横滚视图

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

An R package for simulating Generalised Management Strategy Evaluation

Code and subset of data for "An exploratory analysis of emotion dynamics between mothers and adolescents during conflict discussions" (Main, Paxton, & Dale, 2016, Emotion).

Ukraine War Map/Heatmap

Gesture conflict resolution for iOS and flutter.iOS和flutter手势冲突问题解决.

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

This project uses alternative data, including remote sensing, to track economic activity in Syria in a data-scarce, conflict-affected context. It analyses port and trade activity, mobility patterns, internet connectivity, nighttime lights, vegetation conditions, and conflict events to monitor economic trends and support evidence-based policy.

An elementary OS app

This assignment aims to compare the impacts of conflict across the Fragile, Conflict, and Violence (FCV) regions of the Middle East and North Africa (MENA), Afghanistan, and Pakistan through alternative data sources.

有关滑动的demo样例

Git merge driver for resolving lockfile conflicts in npm v7.0.0+

Detects when a new file is different than an existing file and prompts the user for action.

Python scripts to mine and collect merge scenarios from Git repositories.