Git Made Easy with GitKraken

Chris Berry Development Technologies, Git, Programming Leave a Comment

GitKraken is a graphical user interface for Git built on top of the Electron framework – much like the popular Visual Code editor is. GitKraken is cross-platform, which means that developers can use it on Windows, Mac, and/or Linux. No matter what type of development environment you’re working in, you can have the power of a graphical user interface for Git.

GitKraken has all of the expected features of a graphical user interface for source control usage, AND it has a few hidden jewels which make it an absolutely outstanding tool to use. These are listed and discussed in the blog below.

A Better Approach to Merging Files in Git

Brice McIver Development Technologies, Git Leave a Comment

Git has many features, but it’s likely that you only use a small subset on a daily basis. While git tends to handle things intelligently most of the time, there are situations when doing the most obvious thing doesn’t give git enough information to make informed choices.

In this post, we’ll examine one such scenario – merging files. Through trial and error, I’ll show you the normal approach people take, some of the issues that occur with that approach, and a completely different approach that preserves some data lost in the first approach.