Name		Name	Last commit message	Last commit date
uobioinfo		uobioinfo
.gitignore		.gitignore
Pipfile		Pipfile
Pipfile.lock		Pipfile.lock
README.md		README.md
setup.py		setup.py

Repository files navigation

Github Conflict Demo

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

About

Demo a git conflict.

0 stars

0 watching

Report repository

Releases

Packages

Contributors

Languages