Coding Blocks avatar

Dexa/Coding Blocks

Learn more
Published Aug 27, 2018

87. Thunder Talks

    Dive into the nuances of modern reading habits, realistic data generation, and algorithm efficiency with Joe Zack and Alan Underwood as they unravel digital vs. physical books, Big O notation, and the secrets of JavaScript's event loop. Gain practical insights into mastering Git workflows to enhance your coding efficiency.
    Episode Highlights
    Coding Blocks logo

    Topics covered

    Popular Clips

    Episode Highlights

    • Git Basics

      Understanding Git commands is crucial for efficient version control. Joe Zack and Alan Underwood break down the basics, explaining terms like "head," "working tree," and "index." The head is a reference to the last commit in the current branch, while the working tree is the directory where you edit files, excluding the git directory. The index, or staging area, is a binary file listing files in a branch by their SHA-1 checksums, making Git faster than SVN by avoiding multiple copies 1. They also share humorous tips for navigating Git's complexities, highlighting resources like "Oh Shit, Git!" for practical solutions and laughs 2.

         

      Workflows

      Effective Git workflows are essential for managing code changes and releases. Joe and Alan discuss strategies like maintaining two long-lived branches, "develop" and "master," to ensure production readiness and smooth integration of new features 3. They also explore the nuances of using rebase versus merge, emphasizing that rebase should be used cautiously to avoid rewriting history and causing merge conflicts 4.

      The rebase rewrites the history to put it in the order, like we said, nice and neat at the end. The problem is, if you had pushed that branch up previously, what was hash 123 might now be hash 567.

      --- Alan Underwood

      These insights help teams choose the right approach for their specific needs.

         

      Problem Solving

      Solving common Git issues requires a good understanding of commands like stash, reset, and revert. Joe and Alan explain that "git stash" is useful for temporarily saving changes without committing, allowing you to switch branches easily 5. For removing files from Git without deleting them from the file system, "git reset" is recommended over "git rm," which removes files from both the working tree and index 5. They also discuss reverting commits, where "git reset --soft" can undo a commit while keeping changes in the index 6.

      If you only want to remove it from the index...you could do that, use git reset.

      --- Joe Zack

      These strategies help developers manage their codebase more effectively.

    Related Episodes