10 Git problems & how to solve them
Branch: master
Clone or download
Fetching latest commit…
Cannot retrieve the latest commit at this time.
Permalink
Type Name Latest commit message Commit time
Failed to load latest commit information.
00-assumptions.md
01-committed-too-big
02-accidental-commit-to-master
03-detached-head
04-what-broke-this
05-merge-two-repos
06-revert-merge
07-forget-binary
08-remove-submodule
09-undo-rebase
10-force-pull
LICENSE
README.md
index.html
tracked.md

README.md

License: MIT

10 Sticky Git Situations and how to get out of them

Popular shoutouts to:

  • ohshitgit.com, @oshitgit and @ksylor
  • Michael Kohn "10 Common Git Problems and How to Fix Them"

Getting Started

You can view the slides at https://brianamarie.github.io/10-git-problems/#1.

To practice each exercise, cd into the corresponding directory. Get started with . script.sh, and follow the instructions in the README.md of that subdirectory or on the slides.

To-Do

Note: I'd also like to add a section to each of these on how to avoid these problems in the first place where possible.