Skip to main content
Module 8 of 12

Fixing Mistakes and Resolving Merge Conflicts

Fixing Mistakes and Resolving Merge Conflicts

Learn to handle the inevitable: mistakes and conflicts in test code. Practice undoing commits, recovering deleted test files, and resolving merge conflicts in test scripts, configuration files, and test data. Build confidence in recovering from common Git problems without losing work.

Lessons

  1. Undoing Changes: Working Directory to Committed History (75 min) - beginner
  2. Resolving Merge Conflicts in Test Automation Code (90 min) - intermediate
  3. Advanced Recovery: Reflog, Cherry-pick, and Lost Commit Rescue (85 min) - advanced
  4. Conflict Prevention and Team Recovery Workflows (80 min) - intermediate

Lessons (4)

1 Undoing Changes: Working Directory to Committed History 2 Resolving Merge Conflicts in Test Automation Code 3 Advanced Recovery: Reflog, Cherry-pick, and Lost Commit Rescue 4 Conflict Prevention and Team Recovery Workflows