conflict topic

List conflict repositories

composer-bin-plugin

444
Stars
23
Forks
Watchers

No conflicts for your bin dependencies

LiveActionMap

173
Stars
17
Forks
Watchers

An attempt to map the areas with active conflict in Ukraine using open source twitter data.

Seal

230
Stars
23
Forks
Watchers

A Gradle Plugin for resolving AndroidManifest.xml merge conflicts.

porthog

27
Stars
8
Forks
Watchers

Identify which process is using a specific port.

add-filename-increment

22
Stars
1
Forks
Watchers

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 de...

IntelliMerge

20
Stars
2
Forks
Watchers

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

IntelliMerge-UI

23
Stars
3
Forks
Watchers

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

conflict

33
Stars
1
Forks
Watchers

The first and only complete UI framework for Discord

Active_Directory_Scripts

67
Stars
21
Forks
Watchers

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

git-rebase-via-merge

77
Stars
7
Forks
Watchers

Fix rebase conflicts with minimum pain.