-
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
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
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
Conflict within your team is inevitable. Come learn how to deal with this conflict so it doesn't tear apart your team.
-
Updated
Jun 11, 2023
-
Updated
Aug 29, 2016
Add git conflicts to your vim quickfix list to speedily hop to the next conflict marker
-
Updated
Sep 27, 2019 - Vim Script
Ruby 💎 tool for resolving conflicts in `db/structure.sql`
-
Updated
Apr 4, 2018 - Ruby
I created this tool to help reducing and resolving merge conflicts at early stages by monitoring the git logs at a regular laps of time. Feel free to improve the functionnality, PRs are welcomed!
-
Updated
Dec 1, 2023 - C
A git merge driver for google-java-format.
-
Updated
May 13, 2021 - Shell
Thank you for your interest in my public CV. Feel free to contact me with any additional questions
-
Updated
Apr 24, 2024
Synced todo list with peerjs (http only)
-
Updated
May 31, 2019 - HTML
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."