Use this repo to teach students how to deal with git conflicts.
This repository has been archived by the owner on Mar 7, 2020. It is now read-only.
forked from Zsailer/demo-git-conflict
-
Notifications
You must be signed in to change notification settings - Fork 0
rarichardson92/demo-git-conflict
Folders and files
| Name | Name | Last commit message | Last commit date | |
|---|---|---|---|---|
Repository files navigation
About
Demo a git conflict.
Resources
Stars
Watchers
Forks
Releases
No releases published
Packages 0
No packages published
Languages
- Python 100.0%