In this series, we’ve put a big emphasis on keeping our Git history clean. A big part of it was using features such as rebase. In this article, we go further and learn about fixup commits. With them, we can easily modify changes we’ve introduced in a single commit in our history. Let’s create a […]
By automating processes, we can ensure that they are performed at the right time and Git hooks can help us with it. Also, with JavaScript, we have a commonly used library called Husky. This article delves into how Git hooks work and how Husky helps us deal with them. The idea behind Git hooks With […]
Sometimes, when working on our project with Git, we might commit some code that we are not happy with. One of the solutions that Git provides to undo that is the revert feature. This article looks into how it works and what we need to look out for when using it. The idea behind Git […]
The debugging process is not always easy, and the bugs are sometimes difficult to track down. Fortunately, Git provides us with tools that might make this process easier. In this article, we learn both the worktree and bisect tools. Git Worktree Sometimes, when we focus on a new feature, a bug pops up in production. Unfortunately, this […]
So far, we’ve covered a few different tools useful when rewriting the Git history, such as merging and rebasing. In this article, we go more in-depth and try cherry-picking. While doing so, we also learn how the reflog functionality works. Git Cherry Pick When we rebase or merge, we usually get all of the content of […]
In the previous part of this series, we’ve looked into how rebase can improve our merges. It is a lot more powerful, though, and can come in handy in other situations. In this article, we explore how to perform interactive rebasing. Introduction to the interactive rebase tool When doing an interactive rebase, we can modify existing […]
The creation of software usually takes place across multiple iterations, and our code changes often. Because of that, we need a way to describe this process with the use of versions. There are quite a few ways to do that. Recently the most widely adopted approach seems to be semantic versioning. It involves a sequence of […]
Merging is not the only utility that can integrate changes from one branch onto another. In this article, we look into rebasing and learn how we can use it as an alternative to merging. The basics of rebasing In the previous part of this series, we’ve learned that merging can result in an additional merge commit. This […]
When working with branches, we often need to synchronize our changes. When doing so, we can implement different approaches. In this article, we explain how merging works and discuss various situations. During that, we will touch on the subject of the fast-forward merging and different merge strategies. The basics of merging The job of the git merge command […]
Branches are the bread and butter of a software developer using a Version Control System (VCS) of any kind. Today we explore how they work in Git. In the previous part of this series, we’ve learned that a commit is a full snapshot of the project state. In Git, the branch is a pointer to a […]
