Pull is not possible because you have unmerged files.
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 -a'.
Solution #1 - Resolve conflict
If you want to go through with the merge, follow steps in the accepted answer at
Solution #2 - Start fresh
1. Make a backup copy of your changes, this will erase all of your unsaved modifications.
2. Revert to the head of origin
git reset --hard origin/<mybranchname> git pull origin <mybranchname> git submodule update --init --recursive
3. Then manually put back your changes from your backup copy. Sometimes it is quicker like this, especially if a lot of time has passed since you last synched and your changes were localized.
If you know a third and better way please do comment below.
this is really a saviour.... thanks