-
Updated
Aug 2, 2018 - Java
conflict-resolution
Here are 78 public repositories matching this topic...
Create a custom git command to perform a rebase via a merge
-
Updated
May 27, 2024 - Shell
Sample code that demonstrates NuGet version conflicts within one solution.
-
Updated
Jan 9, 2024 - C#
Edna, a chatbot, provide practical advice and solutions to help resolve workplace issues such as conflict and employee dissatisfaction.
-
Updated
Aug 23, 2021 - Python
Yet Another Sat solvER
-
Updated
Jan 3, 2024 - C
A port of IntelliJ's diff merging algorithm to Haxe
-
Updated
Aug 2, 2023 - Haxe
A tool to help resolve file conflicts in syncthing.
-
Updated
Dec 19, 2019 - Python
Conflict Resolution Web Application for government organisations and businesses
-
Updated
May 21, 2024 - Java
This challenge will test your understanding of a basic codebase and your ability to use git rebase properly.
-
Updated
Oct 21, 2022 - JavaScript
This is a Multistage Interconnection Network (MIN) conflict solver using a heuristic approach
-
Updated
Nov 17, 2023 - C++
Vim Conflict Sleuth: Examine 3-way merge conflicts in multiple tabs in Vim
-
Updated
Aug 1, 2020 - Vim Script
Lightweight LWWElementGraph, which uses LWWElementSet. Handles merges in a Last Write Wins Manner.
-
Updated
Feb 10, 2022 - Python
Created to understand how to deal with conflicts while pushing into the main branch.
-
Updated
Dec 9, 2021
This Project is done by me and my friends for github concepts (ie. merge, pull, branch, issue, etc. ) and basics of html, css
-
Updated
Aug 1, 2023 - CSS
Software composition tool using talents
-
Updated
Dec 7, 2022 - JavaScript
API to get maximum movies which an actor can sign without date conflicts using Flask and C++
-
Updated
Mar 20, 2021 - Python
Repository for "The Economic Consequences of UN Peacekeeping Operations: Causal Analysis for Conflict Management and Peace Research"
-
Updated
Apr 25, 2023 - R
Consistency-based Algorithms for Conflict Detection and Resolution
-
Updated
May 23, 2022 - Java
Improve this page
Add a description, image, and links to the conflict-resolution topic page so that developers can more easily learn about it.
Add this topic to your repo
To associate your repository with the conflict-resolution topic, visit your repo's landing page and select "manage topics."