#

git-conflicts

Here is 1 public repository matching this topic...

sascha-wolf / sublime-GitConflictResolver

A little plugin to help you resolving this nasty conflicts.

git conflict-resolution sublime-text sublime-text-3 hacktoberfest sublime-text-package git-conflicts sublime-text-3-package git-conflict-resolver

Updated Nov 18, 2016
Python

Improve this page

Add a description, image, and links to the git-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 git-conflicts topic, visit your repo's landing page and select "manage topics."