Days ago, I got this message problem when I tried to do the ‘git pull…’ thing in ‘mallard-documentation’ branch
julita@yulys:~/GNOME/baobab/help/C$ git pull --rebase origin mallard-documentation U help/C/scan-remote.page Pull is not possible because you have unmerged files. Please, fix them up in the work tree, and then use 'git add/rm <file>' as appropriate to mark resolution, or use 'git commit -
This happened when I was trying to do changes in baboab topics and the branch was rebased by Kat (when someone “rebases” a branch, it means that they “edit” it)… so what Kat did was merge many commits into few commits (for example, instead of 5 commits which edited the same file, we did have only one commit).
I will show the process I followed to solve the problem. I made it with Kat’s guidance, she is patience :)
julita@yulys:~/GNOME/baobab/help/C$ gitk --all
julita@yulys:~/GNOME/baobab/help/C$ git stash pop help/C/scan-remote.page: needs merge unable to refresh index julita@yulys:~/GNOME/baobab/help/C$ git reset --hard origin/mallard-documentation HEAD is now at ff2e1e2 Add more steps for optional information for scanning. julita@yulys:~/GNOME/baobab/help/C$ gitk