WEHI-Education / git-novice

Version Control with Git
http://WEHI-Education.github.io/git-novice/
Other
0 stars 0 forks source link

Generating Conflicts #6

Open Adamtaranto opened 21 hours ago

Adamtaranto commented 21 hours ago

Current workshop as students add each other as collaborators, this causes confusion and requires different roles for partners.

Alternatives:

1) When committing to a fork you can open PRs back to the upstream main OR to another user's fork 2) User can create conflicting edits with the github interface on their OWN repo.

Both provide opportunities to resolve a conflict.