Git Articles
Dodging Merge Conflicts in git
This article was originally posted on my personal blog under the same title, “Dodging Merge Conflicts in git.” Introduction Of all the source control management systems that have ever been created, git is certainly one of them. You’ve probably used it, and been burned by a particularly complicated merge conflict. Resolving merge conflicts can be […]
Best of 2022: SEP’s Top 6 Software Development Resources of the Year
Looking back at our most viewed software development resource articles throughout the year. #6. WSL, git, and Beyond Compare Since I’m a git command line kind of guy, being able to sudo apt install git was a slice of heaven on a Windows machine. Getting that up and running was pretty nice. However, there is […]
Automatically keeping Git identities distinct between accounts
I’ve ended up with multiple GitHub identities. One for personal use, another for SEP use, and still more for many of our clients. Leaning on Git conditional includes, and a bit of manual work upfront, my GitHub identities can be “automatically” kept distinct. Like many people, I’ve setup a global Git configuration for my name […]
Scripted Git Branch Deployment with Jenkins
When working with git, normally work is done on a branch then merged onto master. However, it is often desired or required that someone else take a look at it before putting it on master. The process of deploying your branch to a test environment is oftentimes manual / time consuming. It does not have […]
Sharing a Git Stash With Another Developer
Sharing a git stash or single commit with another developer is a pretty easy task, but sometimes I forget EXACTLY what I need to type in to make it work the way I want. Also, BONUS section below for a new thing I learned the last time I did it (yesterday!). I found myself needing a […]
WSL, git, and Beyond Compare
Back Story As I was drafting some new blog posts, I was exploring some stuff on the technical side. Part of that was using WSL (Windows Subsystem for Linux) to set up git. Since the Windows 10 Creators Update just dropped, it came with a WSL of Ubuntu 16.04. Not too shabby. Since I’m a […]
What’s in your Utility Belt?
When developing software, we engineers have to use a variety of tools to deliver the right product to our clients. As Batman has practically everything in his utility belt, let’s see what I keep up my sleeve as staples of software engineering. The Soft Skills These are the skills I use for software engineering and […]
Book Club: ProGit
Book Club Foreword A couple years ago I brought up the idea of doing a book club here at SEP because I had participated in a couple before coming to SEP, but we called them SEDG (coined by Steve McConnell in Professional Software Development). I don’t really like that term, so we called it book […]