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