Merge error after converting Git submodule to subtree

Question

I have a project where I was originally using submodules for some dependent code. It turns out that submodules are not really appropriate for this project (and they are hard to

Answer 1

It tried

git fetch --all

git reset --hard origin/master

but it doesn't work.

You can use the 'ours' merge strategy:

git merge -s ours old-master

You can also use git-stash to save your changes then git-stash apply to restore them.