Jul
16
No one seems bothered about merging a submodule conversion from a branch in git
This is the only message I found in the google, and no ones answered it. I managed to figure out a horrible workflow to do it for one submodule conversion.
- make a new branch at your current branch head
- reset your branch back to the commit before you added the submodule
- merge the branch you where trying to merge at this point
- rebase the future work on top of this new head
- force this new head to be the head of the branch you had
