Locate git merge conflicts via CLI. Displays surrounding context and tracks resolution progress.
-
Updated
Apr 1, 2026 - JavaScript
Locate git merge conflicts via CLI. Displays surrounding context and tracks resolution progress.
GLOBAL CONFLICTS & THREATS DETECTION & ANALYSIS INTELLIGENCE SYSTEM (GCTDAI - System)
This repository contains Skald, a proof-of-concept that aims to improve truth discovery by tracking reputation.
Add git conflicts to your vim quickfix list to speedily hop to the next conflict marker
Data engineering pipeline to analyze economical data linked to international conflicts. Project made during the Data Engineering class @ INSA Lyon.
Automates the detection, labeling, and resolution of pull request conflicts, ensuring a smoother and more efficient CI/CD workflow.
Resolve git merge conflicts interactively via terminal. Runs on pure Node.js with zero dependencies.
Understanding why we fight — and how we can stop. Free, open-source peace education platform.
This report presents a comprehensive analysis of governance performance across African nations from 2014 to 2023, based on the Ibrahim Index of African Governance (IIAG).
An analysis of the correlations between incidents of armed conflict, fatalities, high temperatures, and cities of traditional cultural crossroads, specifically, an analysis on the Silk Road cities, as hotbeds of violence, high heat, and cultural diversity.
Experimenting with Git branches/merges/conflicts. Collaboration with Can Toraman
Create a custom git command to perform a rebase via a merge
Placidus is a formal verification and management platform for Software Defined Networks, and it has a core that verifies the following properties: conflicts, redundancies and reachability on network topologies.
Скрипт, который проверяет конфликты в PR и сразу оповещает о них. Работает под Linux с установленным noify
💥 Toy Git client to easily provoke merge conflicts
Add a description, image, and links to the conflicts topic page so that developers can more easily learn about it.
To associate your repository with the conflicts topic, visit your repo's landing page and select "manage topics."