Complete the merge after resolving conflicts in Git
This article describes the process of completing a merge after resolving merge conflicts in Git. We will go through the merge steps, resolve the conflicts, and complete the merge.
Complete the merge after resolving conflicts in Git
For a simpler context, we will simulate a scenario where merging two branches in our repository results in a conflict. This is the typical workflow.
Switch to our master branch and make some edits to the README.md file.
$ git checkout main
After making our edits, we will commit the file, switch to the Dev2.1 branch and make the changes to the README.md file.
$ git checkout Dev2.1
We will edit the same lines for Git to create a merge conflict. After committing, we can now run the git merge command.
$ git merge main
The output is as follows:
To resolve merge conflicts, we strongly recommend using a merge tool like Meld . We have configured Meld as our default diff and mergetool .
To start it, we will run:
$ git mergetool
After resolving the conflicts, we can quickly check the status of the working tree and the index.
$ git status
The output is as follows:
Following Git's advice, we can run the git commit command to complete the merge process. In our example, we will run:
$ git commit -m "Merge Dev2.1 to main"
The output is as follows:
[Dev2.1 cb9b842] Merge Dev2.1 to main
Another way to complete the merge is to use git merge --continuethe command. This command will prompt us into a text editor where we should give our commit a name to complete the merge.
$ git merge --continue
If we don't want to edit the commit message, we can run:
$ git merge --continue --no-edit
The output is as follows:
In short, we can complete the merge after resolving the conflicts using either the command suggested by Git git commitor git merge --continuethe command. Both will give the same desired output.
For reprinting, please send an email to 1244347461@qq.com for approval. After obtaining the author's consent, kindly include the source as a link.
Related Articles
Push to a specific branch in Git
Publish Date：2025/04/02 Views：53 Category：Git
-
In Git, we use branches to develop independent features directly from the main workflow of the project. Since Git is considered to be the best version control system so far, we have local and remote branches in our repository for different
Solve the Git Push Everything Up-To-Date Problem
Publish Date：2025/04/02 Views：120 Category：Git
-
Git is a free, open source version control system designed to work with projects quickly and efficiently. You can make changes to your repo and push them to master branches. This article explains how to use git push the command to resolve e
Git merge development branch into feature branch
Publish Date：2025/04/02 Views：126 Category：Git
-
Creating new branches and merging them is considered to be the most powerful tool of Git. The ability of Git to create new branches and merge them into the development code is very useful for developers working in a team environment. This f
Understanding Git conflict markers
Publish Date：2025/04/02 Views：112 Category：Git
-
In this article, we will discuss git conflict markers. Understanding Git conflict markers When pulling changes from a remote repository, you may encounter merge conflicts. Merge conflict files can sometimes be confusing. A typical merge con
Selectively merge changes from different branches in Git
Publish Date：2025/04/02 Views：116 Category：Git
-
This article will discuss merging specific changes from one branch to another. As we know, when merging branches, Git merges all files without exception. You may find yourself in a scenario where you have some commits in one branch and you
Pushing an empty commit to a remote in Git
Publish Date：2025/04/02 Views：65 Category：Git
-
This article will teach you how to push an empty commit to a remote repository. A commit with no changes is an empty commit because it only contains the commit message. This is useful if we need to push changes to a remote branch to trigger
Moving commits to another branch in Git
Publish Date：2025/04/01 Views：201 Category：Git
-
Git is a very useful and powerful tool in the modern software world. Many types of files and codes can be stored through branches and commits in Git. Branches are a different concept depending on the version control system you use. Many dev
Git push using SSH keys
Publish Date：2025/04/01 Views：94 Category：Git
-
SSH stands for Secure Shell. It is the key that provides us with the credentials to access the SSH network protocol. It provides access to remote servers between engines on an unsecured open network. It is used for transferring data, files,
Delete commits but keep changes in Git
Publish Date：2025/04/01 Views：180 Category：Git
-
This article outlines the steps necessary to undo a Git commit while preserving the changes introduced by the same commit. We'll cover two commands we can use that have the same effect. Without further ado, let’s jump right in. Remove com
