git-conflict-resolver

Here are 3 public repositories matching this topic...

A little plugin to help you resolving this nasty conflicts.

VSCode extension for CoDiff

A simple web-based tool to resolve Git merge conflicts directly in your browser.

github javascript css git html js git-conflicts git-conflict git-conflict-resolver conflict-resolver conflict-git conflict-solver

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

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