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.
2.1m questions
2.1m answers
60 comments
57.0k users