Showing all posts tagged: 'git'

A 4-post collection

Getting started with DevOps

DevOps, micro-services, containers, Agile etc. All these terms are widely (ab)used in the developer circles and for many developers they are the norm. There's no tech conference today that doesn't have a track on at least one of these and for a good reason. They are the new and, almost, established way of working with code. Some of them have been around for a while, so they are well established. Others are just getting into the enterprise world - think of containers here. DevOps is definitely not new. If you're a developer, you've been doing DevOps for a long …[read more]

Merge detached HEAD back to origin/master – Git

I’ve recently had to use this awesome Git feature to fix a problem. I was aware that the last couple of check-ins were bad and I wanted to pick up and continue working from a known working point. Git allows you to do this by temporarily switching to a different commit. The command to do this is: $git checkout c2744f95d c2744f95d is the commit hash (SHA) so make sure you find and use the right commit hash. From that point on, you can continue working as normal. Another option is to create a totally new branch (a feature branch …[read more]

Delete Git branch locally and remotely

I stumble across this one every so often. And since I have to look it up every time, I may as well document it. Today's post is small and easy. To delete a Git branch after the completion of a feature or bug fix, you can use the following commands. Cause the CLI rules, right, RIGHT? Anyway, back to the task at hand. As you realize, there are 3 different branches that need to be deleted in Git: The local <branch> The remote origin/<branch>. The local remote-tracking branch origin/<branch> that tracks the …[read more]

How to update your Git credentials on Windows

Git is awesome and I love it. Plain and simple. It works. Yet, there are occasions when things within Git break. And then you have to go googlebing for the solution. I'm just back from a 2-week holiday and, as expected, my Windows credentials had expired so I changed them. Then I tried to do a git pull and I got this nice error message: $ git pull fatal: Authentication failed for `repo url/` Apparently, updating my domain credentials also broke my Git credentials. At first, I thought there was an issue with my credential.helper. So I unset it and …[read more]