I have a 'super-repository' that has a submodule that is essentially a fork of an original repository (with my changes). What would be a possible workflow I can use to merge with the latest changes on the master branch of the original repository into the submodule? In other words, I want to update the submodule to the latest changes.
I imagine I'd have to add a remote representing that original repository. So I went into the submodule's directory and added the remote, then tried git pull origin master, then in the super-repo I did git add the-submodule, commit and push. However, on another computer when I tried to do git pull && git submodule update, I got the following error:
fatal: reference is not a tree: 1790434a80cca4173677c9a21ffd80a50cc970ef
Unable to checkout '1790434a80cca4173677c9a21ffd80a50cc970ef' in submodule path 'oh-my-zsh'
So I imagine I'm doing it wrong. I would appreciate any help.
I ended up starting from scratch, it worked.