Closed bgold-cosmos closed 4 years ago
rebase done, and FWIW I also needed a git checkout --track upstream develop
first since my repo dated back before the name change from master. Thanks for providing the missing step, I had been having trouble figuring out how to get things back in sync.
Thanks very much for this @bgold-cosmos, and thanks also for the git tip, @telephon
one more thing: could you do a rebase on develop? Just to get rid of all these unrelated merges.
git rebase -i develop
then resolve any conflicts (I don't think there are any) andgit push -f
rewrite the history here.