ribas89

Git 101: Conquer the GIT POWER

Git 101: Conquer the GIT POWER

ribas89's photo
ribas89
·

1 min read

The production deploy task started, but it fails shortly after. A CONFLICT was found inside MASTER from a commit YOU did.

Your blood freezes as you feel another dev touching your shoulder. You both stare at each other like this:

image.png

These articles will help you avoid entirely or at least make it easier to handle those kinds of situations.

  1. Git 101: The three secrets of good git management
  2. Git 101: Beauty and clarity: everyone will love your branches
  3. Git 101: Boost your merge speed by avoiding conflicts and merge commits
  4. Git 101: Peace of mind with git reset --hard
  5. Git 101: Surgical precision: git reset --soft and cherry-pick