Git submodule merge updated remote submodule into local submodule with local changes

Question

Is there a way to pull new changes from a submodule into a local version of that submodule with changes that have been made (essentially do a merge)?

I don't want to make a new branch for the submodule.

Answer 1

等待大神答复