There are 1 repository under conflict topic.
No conflicts for your bin dependencies
An attempt to map the areas with active conflict in Ukraine using open source twitter data.
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.
The intuitive UI for IntelliMerge, where the developers can merge code and resolve conflicts.
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 graph-based refactoring-aware three-way merging tool for Java programs.
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
Ukraine War Map/Heatmap
Borscht - A Russian service monitor to track the uptime of domains and services
Code and subset of data for "An exploratory analysis of emotion dynamics between mothers and adolescents during conflict discussions" (Main, Paxton, & Dale, 2016, Emotion).
This repository serves as a testbed for learning and practicing Git and GitHub workflows.
PHP Based Sudoku Puzzle Solving
Gesture conflict resolution for iOS and flutter.iOS和flutter手势冲突问题解决.
有关滑动的demo样例
Detects when a new file is different than an existing file and prompts the user for action.
(ML) model for computing conflict risk from climate, environmental, and societal drivers.
Python scripts to mine and collect merge scenarios from Git repositories.
A python tool which helps with changelog/release file conflicts with git
Detects when a file to be written is different than an existing file and, if necessary, prompts the user for action.
Utility to automatically resolve composer.lock git conflicts
Github action for monitoring pull requests on a repository
an R function to ingest ACLED event data using jsonlite for ingestion and data.table for processing
Simple 3-way merge editor for the terminal
Explica con ejemplos los conceptos de de Merge, Rebase, Pull Request y Stash.