When Bart started this mini-series within a series on using Git for version control, he explained that our journey would be in three Phases. Phase 1 was the section where we learned about local repositories, and Phase two was dedicated to learning how to have multiple repositories just for ourselves. In this lesson, we finish […]
Continue readingTag: git
CCATP #681 – Bart Busschots on PBS 114 – Tracking Git Branches
We continue on our journey to learn how to use Git to do version control as a single person, but this time with multiple devices. As Bart says during this episode, “Who is learning to program here who doesn’t have multiple computers?” We’ve learned how to push our changes to a single separate repo, but […]
Continue readingCCATP #679 – Bart Busschots on PBS 113 of X My First Git Remote
Last time on Programming By Stealth, Bart introduced the concept of remote repositories, also known as remotes. It was one of those episodes where we learned a lot but didn’t get to apply what we learned. In this week’s installment, we get our hands digitally dirty as we create a bare repository (a repo with […]
Continue readingCCATP #677 – Bart Busschots on PBS 112 of X – Introducing Git Remotes
In this next installment in our mini-series on learning Git, Bart Busschots gives us some foundational knowledge on how to work beyond being one person with one Git repository. He starts by reinforcing what he’s explained before, that Git is a peer-to-peer technology, which is hard to wrap your head around if you’re used to […]
Continue readingCCATP #669 – Bart Busschots on PBS 111 of X – Stashing Changes
In this installment of Programming By Stealth, Bart teaches us how Git can help us when we forget to switch to the correct branch before starting to make changes to our code. We’re only human, and we will forget, and Git’s stash command allows us to set our changes aside, switch to or even create […]
Continue readingCCATP #668 – Bart Busschots on PBS 110 of X – Merge Conflicts
In this installment of Programming By Stealth Bart teaches us how to deal with conflicts in branches of our code. He has been purposely only changing one thing at a time before now, but it’s time to face the reality of when two branches change the same line in the same file. I’ve been terrified […]
Continue readingCCATP #666 – Bart Busschots on PBS 109 of X — SemVar & Structured Commits
We continue our mini-series within a series learning the version control system Git. We learn two methods to enhance our branching strategy. First, we’ll walk through some basic principles on how to number our released versions of our code. From there we’ll explore three types of changes that would cause a change in our release […]
Continue readingCCATP #665 – Bart Busschots on PBS 108 of X — Merging & Tagging
In this installment of Programming By Stealth, Bart Busschots continues on his series within a series explaining the version control system Git. We advance in our branching strategy by working several commits on our dev branch and then learn to use a merge commit to bring only the final commit into the main branch, leaving […]
Continue readingCCATP #663 – Bart Busschots on PBS 107 of X – Branching Basics
This week in our miniseries on learning the version control system Git, Bart dips our proverbial toe into branching. Branches allow us, as developers, to work on bugs or feature enhancements in a separate place from our stable code, and only merge the code back in when the bugs are squashed or the features are […]
Continue readingCCATP #661 – Bart Busschots on PBS 106 of X — Time Travel with Git
As we continue to learn Git from the command line for version control, Bart teaches us some tricks to travel through time. First he shows us how to view more compact Git logs so we can just see a shortened hash and the first line of our commit message. Then he shows us how to […]
Continue reading