Git and GitHub / Intermediate: collaborative change management

Git and GitHub β€” Intermediate: collaborative change management

Prepare reviews, resolve conflicts, preserve interrupted work, and correct history responsibly.

6 lessons Β· No account required

What you will learn

  • Connect pull-request review to the current candidate.
  • Resolve and verify operation-specific conflicts.
  • Choose rebase, backport, revert, and workflow controls by context.

  1. GitHub pull requests and useful review

    Present a reviewable change and interpret platform checks without confusing approval, mergeability, and correctness.

    Start learning

  2. Conflict resolution as semantic integration

    Inspect base and side versions, choose intended behavior, and verify the resolved snapshot before continuing.

    Start learning

  3. Stash, worktrees, and interrupted work

    Choose a temporary save or a separate checkout without treating either as a substitute for durable shared history.

    Start learning

  4. Rebase, cherry-pick, and private history

    Replay changes deliberately while preserving recovery anchors and respecting collaborators who depend on existing commits.

    Start learning

  5. Revert, reset, and choosing the right undo

    Choose correction by the state being changed and whether collaborators already depend on the history.

    Start learning

  6. Testing and collaborative GitHub workflows

    Keep automated evidence attached to the candidate revision and protect the boundary between contributed code and privileged automation.

    Start learning
Back to course