search

git-merge-workshops / git-it-right

In this workshop, participants will learn the basics of common Git commands used in various situations. This includes commands which help you examine repo history and state while also learning to manipulate repo history.
5 stars 0 forks source link

readme

"Welcome to Git It Right workshop" 👋

mona-ocean

Welcome. In this workshop, participants will learn the basics of common Git commands used in various situations. This includes commands which help you examine repo history and state while also learning to manipulate repo history.

We will jump through the hoops 🏃 and all the challenges ahead of us ⛰️ 🔥, but it will be fun! 🎮

mona

🍿 Our navigation route

  1. Prerequisite check - Before getting started, we want to make sure that everyone is ready to start
  2. Warm up - Brushing up on basic git commands
  3. Undoing git commit - Let's explore how git revert, git commit --amend, git soft reset, and git hard reset differ
  4. Git Revert - Simplest and safest way to revert commit
  5. Git Commit Amend - Let's fix an existing commit
  6. Git Cherry Pick - How to pick that specific commit then bring it to my other branch
  7. Git Rebase and Git Squash - How to merge one branch into another and learn what git squash is
  8. Git Reset - Dangerous but powerful operations to change git history
  9. Git Bisect - Very useful built-in tool to use binary search to find that problematic commit
  10. Wrapping Up - Where to go from here and little goodbye word