/MergeConflictExamples

Primary LanguageTypeScript

Sample Merge Conflict Files

This repository contains merge conflict examples taken from open source projects in Java, C#, and TypeScript.

Recreate Merge Conflicts Locally

git clone https://github.com/Smfakhoury/MergeConflictExamples.git
cd MergeConflictExamples
git checkout left
git pull
git checkout right
git merge left