Skip to content
This repository has been archived by the owner on Mar 7, 2020. It is now read-only.

rarichardson92/demo-git-conflict

 
 

Folders and files

NameName
Last commit message
Last commit date

Latest commit

 

History

1 Commit
 
 
 
 
 
 
 
 
 
 
 
 

Repository files navigation

Github Conflict Demo

Use this repo to teach students how to deal with git conflicts.

About

Demo a git conflict.

Resources

Stars

Watchers

Forks

Releases

No releases published

Packages

No packages published

Languages

  • Python 100.0%