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
Git installation and establishment of local warehouse service
Publish Date：2025/04/05 Views：89 Category：Git
-
Git is a distributed version control system: the client does not only extract the latest version of the file snapshot, but also completely mirrors the original code repository. It has the following advantages: a. Since every extraction oper
git remote operation——multiple remote repositories for one project
Publish Date：2025/04/05 Views：131 Category：Git
-
Multiple remote repositories for a git project In our git project, the command to operate the remote repository information is $ git remote # 查看当前所有的远程仓库的名称 $ git remote -v # 查看远程仓库的名称和远程仓
Git cherry pick command usage
Publish Date：2025/04/05 Views：190 Category：Git
-
git cherry-pick is a powerful command that allows us to select an arbitrary Git commit by reference and attach it to the HEAD of the current working branch. Cherry picking is the act of picking a commit from one branch and applying it to an
Comparison between Git merge and Git rebase
Publish Date：2025/04/05 Views：171 Category：Git
-
The git rebase command may seem like Git wizardry to beginners, but if used carefully, it can actually make life easier for your development team. In this article, we compare git rebase with the related git merge command and identify all th
How to fix Git error Error: src refspec master does not match any
Publish Date：2025/04/05 Views：124 Category：Git
-
When using Git, we may encounter the error "src refspace master does not match any". Here's what the error means and how to fix it. What does src refspec master does not match any Mean in Git mean? We may encounter this error when we try to
Rebase local branch when pulling changes from remote repository branch in Git
Publish Date：2025/04/05 Views：144 Category：Git
-
This article will cover the basics of rebasing your local branch when pulling changes from a remote repository branch in Git. We use the version control system Git to track changes made to files. We commit changes in a local branch in our l
Undo Git Stash
Publish Date：2025/04/04 Views：187 Category：Git
-
This article explains how to make and save changes to a repository. Git allows you to save changes locally and push them to a server when needed. In Git, we don't use the term save , but commit . We use git add , git commit , and git stash
View a list of cache entries in Git
Publish Date：2025/04/04 Views：59 Category：Git
-
We often need to pause our work and focus on something else in our development environment. Therefore, we may need to temporarily save our current work and focus on a different one. We may want to resume our original work later. git stash T
Git stores specific files
Publish Date：2025/04/04 Views：115 Category：Git
-
This article will cover storing changes to only specific files in Git. In Git, when we make some changes in our working tree, we may have some changes which may or may not be staged in our local repo. We may now wish to save these changes f
