A merge conflict occurs when two or more contributors make changes to the same file or set of files in a project, and those changes conflict with each other. This conflict can happen when two contributors modify the same line of code, delete or rename the same file, or make changes in different branches of the same repository. In this article, we will discuss how to resolve merge conflicts using a pictorial diagram and example.
Understanding the Merge Conflict
Before we jump into resolving merge conflicts, it is essential to understand what causes them. Let’s take an example of a project hosted on a version control system like Git. Suppose two contributors, Alice and Bob, are working on the same project, and they both have cloned the repository on their local machines. Alice makes some changes to a file, commits, and pushes them to the central repository. At the same time, Bob also makes some changes to the same file but has not yet pushed them to the central repository.
When Bob tries to push his changes, he will encounter a merge conflict because the changes he made in his local copy conflict with the changes made by Alice. Git cannot automatically resolve this conflict, and it’s up to Bob to resolve it manually.
Master version control and streamline your collaboration with our comprehensive GIT course!
Git and GitHub MasterClass : Git Workflow, Commands & GitHub
Resolving Merge Conflicts
To resolve the merge conflict, Bob needs to perform a series of steps. Let’s go through these steps using a pictorial diagram and example.
- Pull Changes from the Central Repository: The first step is to pull changes from the central repository. Bob needs to update his local copy of the repository to include the changes made by Alice. This step ensures that Bob has the latest changes before making any modifications.
- Identify the Conflicting Files: After pulling the latest changes, Bob needs to identify the conflicting files. Git marks the files that have conflicts with the “unmerged” status. In our example, the file that Alice and Bob have modified will have a conflict.
- Open the Conflicting File: Bob needs to open the conflicting file in an editor or an IDE. The file will contain the conflicting changes highlighted with Git conflict markers. These markers indicate which changes conflict and need to be resolved manually.
- Resolve the Conflicts: Bob needs to resolve the conflicts manually by editing the conflicting file. He needs to choose which changes to keep and which to discard. In our example, Bob wants to keep the changes made by Alice and remove his changes.
- Commit the Changes: After resolving the conflicts, Bob needs to commit the changes to the central repository. He needs to add the modified file to the staging area and commit the changes with a commit message. This step completes the merge conflict resolution process.
Conclusion
Merge conflicts are a common occurrence in collaborative projects, and resolving them is essential to maintain the project’s integrity. In this article, we discussed the steps involved in resolving merge conflicts using an example. By following these steps, contributors can resolve conflicts and ensure that the project remains stable and functional.
