#

merge-conficts

Here is 1 public repository matching this topic...

knittl / stackoverflow-4624357

Sample repository for https://stackoverflow.com/a/4624383/112968

git stackoverflow merge branch conflict branches git-merge merge-conficts

Updated Jul 30, 2020

Improve this page

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