0

I have about a year old branch with submitted PR.

About 6 month later I tried to pull the latest master in but for some reason didn't finish.

Now I'll try to complete the PR and submit it for inclusion.

Unfortunately between the time it was submitted and later on updated a new submodule was introduced. And now I can't merge the latest master.

I tried to issue

git submodule update --init

but received

Skipping unmerged submodule

Didn't work even with --force.

Can I delete the folder and redo that command?

If not - what the proper way of merging that 6-month old changes and moving ob?

Improve this question
Related questions
20362
How do I delete a Git branch locally and remotely?
11992
How can I rename a local Git branch?
8872
How can I check out a remote Git branch?
Load 6 more related questions Show fewer related questions

0

Reset to default

Your Answer

By clicking “Post Your Answer”, you agree to our terms of service and acknowledge you have read our privacy policy.

Start asking to get answers

Find the answer to your question by asking.

Ask question

Explore related questions

See similar questions with these tags.