Posts Tagged “git”

Exploring File Changes Over Time

Recently I needed to track down when a particular piece of logic changed in a file. I couldn't remember the date that it changed or any relevant information that might help me find the commit in which it changed. Luckily, git (and GitHub) provide tooling that helped me find what...

Recover a dropped Git stash

Have you ever accidentally drop something from your stash in Git? Luckily it is not actually gone forever. There are a couple strategies for getting it back.

Resolving Git Merge Conflicts

Merge conflicts are no stranger to anyone that uses some form of version control. Git does a great job at auto-merging conflicts, but there are many instances when Git cannot determine what must be done automatically and a manual merge is required. Though this can be a pain at times,...