Skip to content
No description, website, or topics provided.
Branch: master
Clone or download
Fetching latest commit…
Cannot retrieve the latest commit at this time.
Type Name Latest commit message Commit time
Failed to load latest commit information.

This repository has 2 branches : master and conflicts.

On master, a_file_with_conflicts contains "I added this line on master branch" on line 3. On conflicts, it contains "I added this line on conflicts branch" on line 3.

You can clone this repository to replicate state 1.6 of my article.

After cloning, you can use git merge conflicts to start the merge process, and follow along the article.

You can’t perform that action at this time.