conflict topic
composer-bin-plugin
No conflicts for your bin dependencies
LiveActionMap
An attempt to map the areas with active conflict in Ukraine using open source twitter data.
Seal
A Gradle Plugin for resolving AndroidManifest.xml merge conflicts.
porthog
Identify which process is using a specific port.
add-filename-increment
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
A graph-based refactoring-aware three-way merging tool for Java programs.
IntelliMerge-UI
The intuitive UI for IntelliMerge, where the developers can merge code and resolve conflicts.
conflict
The first and only complete UI framework for Discord
Active_Directory_Scripts
Making my local storage of useful AD Scripts available to everyone.
git-rebase-via-merge
Fix rebase conflicts with minimum pain.