Menu

Resolve merge conflicts on GitHub

Merge conflict

Merge conflict happens when two branches modify the same file and the same line of code. Git will not merge the branches automatically but displays the error message. We need to resolve all merge conflicts in order to merge a pull request successfully.

 

Automation Re-base

Resolve conflict

Simple merge conflicts can be resolved by using the Resolve conflicts button in the pull request.

Resolve Merge Conflicts

 

Click on the Resolve conflicts button.

Manually resolve the merge conflict. Decide which code to retain and remove the unnecessary code changes.

 

Merge conflicts Demo

 

Mark the conflict as Resolved by clicking the Mark as resolved button.

Click on the Commit merge button.

Now the Merge pull request button would be enabled.

Merge pull request after merge

 

Click on the Merge pull request to merge the changes and resolved conflicts.

Related Posts

Git Workflow Comparison

Git Workflow Comparison Common Git workflows are detailed here. Choosing the Right Workflow: If your team works on smaller projects with simple development cycles, Centralized Workflow or GitHub Flow might work best. For larger projects with more structured release management, Gitflow or Feature Branch Workflow would be appropriate. If you’re contributing to open-source projects or […]

Common Git Workflows

Common Git Workflows There are several common Git workflows used by development teams and open-source contributors, each offering different ways to manage branching, merging, and collaboration. The choice of workflow often depends on the size of the team, the nature of the project, and the complexity of the codebase. Some common Git workflows are as […]

Git Graphs

Git Graphs A Git Graph is a visual representation of the commit history of a Git repository. It shows the sequence of commits and the relationships between them, making it easier to understand the branching, merging, and overall structure of a project’s development history. Features of Git Graphs Commits: Each node in the graph represents […]