error saying unmerged paths

0 votes
I'm trying to execute the git pull command and i'm getting an error saying unmerged paths. How do I clear it?
Jun 27, 2018 in Git & GitHub by Hannah
• 16,210 points
252 views

1 answer to this question.

0 votes

Git merging means taking changes from one context and combining it with your current working files. Most of the times git figures how to merge but there are few cases when you need to tell git what you do.

For example, when two people make changes to the same line in same file, when one person decides to delete while another person decides to manipulate the file etc.

try $git mergetool

It opens a GUI that helps you through every single step in resolving merge conflict.

The command does not open a GUI unless you've installed one.

 set vimdiff as your default merge too using the following commands

$git config merge.tool vimdiff

$git config merge.conflictstyle diff3

$git config mergetool.prompt false

run the following command

 $git mergetool

You'll see a vimdiff display

LOCAL BASE REMOTE
MERGED

You can navigate between different views using ctrl+w and reach the MERGED view using ctrl+w-j

You could edit the MERGED view the following wa

 -If you want to get changes from REMOTE

  :diffg RE 

 -If you want to get changes from BASE

  :diffg BA 

 -If you want to get changes from LOCAL

 :diffg LO

Save, Exit, Commit and Clean up

 :wqa save and exit from vi

git commit -m "message"

git clean Remove extra files created by diff tool.

answered Jun 27, 2018 by anonymous

Related Questions In Git & GitHub

0 votes
1 answer
0 votes
1 answer

How to solve the ‘Git commit -a error’?

This happens when no editor is set. ...READ MORE

answered Jul 5, 2018 in Git & GitHub by Tyrion anex
• 8,270 points
69 views
+1 vote
3 answers

Cloning the Git Repository on Eclipse (Transport Error)

File/Import... Select dialog * Git/Projects from Git * click next Select ...READ MORE

answered Jul 23, 2018 in Git & GitHub by Kalgi
• 41,990 points
2,982 views
0 votes
1 answer

Error: git pull fails “unable to resolve reference” “unable to update local ref”

This happens when there are unnecessary files ...READ MORE

answered Jul 26, 2018 in Git & GitHub by Sophie may
• 9,850 points
1,413 views
+1 vote
5 answers
+1 vote
4 answers

error cloning remote repo 'origin'

ERROR: Error cloning remote repo 'origin' hudson.plugins.git.GitException: Could ...READ MORE

answered Jun 3 in Git & GitHub by Sirajul
• 35,810 points
4,394 views
+13 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,380 points
204 views
0 votes
1 answer