Easy-to-use CUI for fixing git conflicts
-
Updated
Oct 9, 2019 - Go
Add a description, image, and links to the conflict-resolution topic page so that developers can more easily learn about it.
To associate your repository with the conflict-resolution topic, visit your repo's landing page and select "manage topics."