Skip to content

Generating Conflicts #6

Description

@Adamtaranto

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.

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Fields

    No fields configured for issues without a type.

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions