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 TagCategory: Programming by Stealth
CCATP #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 #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 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 #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 readingMore TagCCATP #659 – Bart Busschots on PBS 105 – Seeing the Past with Git
In this installment of Programming By Stealth, Bart takes us on a time traveling adventure with Git. By using commands like git diff we can see changes over time, but we can actually see older versions of the code in a couple of ways. Using the archive command we learned out to pull just the […]
Continue readingMore TagCCATP #658 – Bart Busschots on PBS 104 – Tracking Changes in Git
In our next baby step in learning to use the version control system Git, Bart teaches us how to track changes. We start by doing a bit of housekeeping, especially for Mac users to set Git to always ignore those pesky .DS_Store files. We learn how to stage and then commit a simple change, then […]
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