Category: Git

In my previous article, I discussed merge conflicts, specifically line merge conflicts, and how to resolve them on GitHub. In this article, I will focus on another type of merge conflict, the modify/delete conflict, and how to resolve it using Git. Modify/delete conflicts occur when, on one branch in the merge operation, a file has…

In this blog post, we will dive deeper into the concept of branches and explore how they can be merged using pull requests (PR) in Git and GitHub. If you’re new to this topic, we highly recommend checking out our previous article to understand the background, code samples, and environment setup. It lays the foundation…