How to resolve merge conflicts in Git repository

+1 vote

Hi Team,

I have updated files in the Git repository. Now I am facing merge conflicts. I want to resolve merge conflicts in my Git repository. How can I do that?

Nov 21, 2020 in Git & GitHub by akhtar
• 38,170 points
103 views

1 answer to this question.

+1 vote
Hi@akhtar,

You can try with git mergetool. It opens a GUI that steps you through each conflict, and you get to choose how to merge. Sometimes it requires a bit of hand-editing afterward, but usually, it's enough by itself. It is much better than doing the whole thing by hand certainly.
answered Nov 21, 2020 by MD
• 95,180 points

Related Questions In Git & GitHub

0 votes
1 answer

How to do a re-merge into another branch in git

Seems like you want to rebase your ...READ MORE

answered May 7, 2018 in Git & GitHub by DareDev
• 6,890 points
909 views
0 votes
1 answer

How to add a remote git repository in Jenkins

Follow these steps: Step 1 Go to Manage ...READ MORE

answered May 23, 2019 in Git & GitHub by Alok
1,909 views
0 votes
0 answers

How to find and restore a deleted file in a Git repository?

Hi Team, I have one Git repository. I ...READ MORE

Dec 22, 2020 in Git & GitHub by akhtar
• 38,170 points
116 views
+1 vote
1 answer

How to abort the merge conflict in Git?

Hi@akhtar, You can use the git reset --merge ...READ MORE

answered Dec 23, 2020 in Git & GitHub by MD
• 95,180 points
455 views
+15 votes
2 answers

Git management technique when there are multiple customers and need multiple customization?

Consider this - In 'extended' Git-Flow, (Git-Multi-Flow, ...READ MORE

answered Mar 26, 2018 in DevOps & Agile by DragonLord999
• 8,450 points
1,073 views
+2 votes
1 answer
0 votes
1 answer

How to merge with squash in Git?

Hi@akhtar, If you want to merge your data ...READ MORE

answered May 13, 2020 in Git & GitHub by MD
• 95,180 points
132 views
0 votes
1 answer

How to find the hidden files in the Git repository?

Hi@akhtar, To find the hidden files in the ...READ MORE

answered Nov 19, 2020 in Git & GitHub by MD
• 95,180 points
684 views