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 readingMore TagTag: version control
CCATP #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 readingMore TagCCATP #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 readingMore TagCCATP #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 readingMore TagCCATP #656 – Bart Busschots on PBS 103 of X — Getting Started With Git
After some quick revision from the previous episode, Bart explains how Git commands work with their subcommands. We start by looking at how to configure Git and the differences between local, global and system-level settings. Then we create our very first repo with an exciting README file, and we commit the file to our repo. […]
Continue readingMore TagCCATP #654 – Bart Busschots on PBS 102 of X – Introducing Git
In our last Programming By Stealth we learned about the concept of version control, and the evolution from client/server version control to peer-to-peer version control and the creation of Git. In this installment we start learning the fundamental concepts of Git. We learn about the database, the working copy, and the index and understanding the […]
Continue readingMore TagCCATP #652 – Bart Busschots on PBS 101 – Introducing Version Control
In this turning of the century episode of Programming By Stealth, it’s time to take on a new subject: version control. As Bart explains in this week’s episode, version control allows you make changes in your code and roll the changes back. This gives us the freedom to experiment and if an idea doesn’t pan […]
Continue readingMore Tag