#

merge-conflicts

Here are 2 public repositories matching this topic...

balbuf / composer-git-merge-driver

Custom git merge driver to minimize merge conflicts in composer.json and composer.lock files

git merge-conflicts composer merge git-merge git-merger composer-json merge-conflict composer-lock

Updated Mar 12, 2023
PHP

console-helpers / svn-buddy

Simplified Subversion command-line workflow

merge-conflicts cli merge svn subversion

Updated Jan 30, 2025
PHP

Improve this page

Add a description, image, and links to the merge-conflicts topic page so that developers can more easily learn about it.

Curate this topic

Add this topic to your repo

To associate your repository with the merge-conflicts topic, visit your repo's landing page and select "manage topics."