#

merging-conflict

Here are 2 public repositories matching this topic...

tonyg / revctrl.org

An extract, as complete as I can make it, of content from the revctrl.org wiki

merge-conflicts version-control source-control merging-algorithms revision-control merging-conflict

Updated Oct 14, 2021
Python

xavigh / merge-conflict

Learning Lab course

course merging-conflict

Updated Mar 7, 2019
HTML

Improve this page

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