I managed to mess up my remotes and would like to get back in sync with origin. I have previously deleted all remotes and have manually re-added them.
My remotes are:
$ git remote -v show
origin https://github.com/rapid7/metasploit-framework (fetch)
origin https://github.com/rapid7/metasploit-framework (push)
truekonrads git@github.com:truekonrads/mriv-metasploit.git (fetch)
truekonrads git@github.com:truekonrads/mriv-metasploit.git (push)
I would like to update origin/master to latest version and then merge truekonrads/mirv-events branch into master. How do I do it?
is it possible to do it in a fashion that github keeps track of origin?
To “update origin/master to latest version”:
To “merge truekonrads/mirv-events branch into master”:
Not sure what you mean by github keeping track of origin. Your local repository is keeping track of
origin. You couldgit remote add github <URL>; git push github origin/master:latest_origin_masterto push a copy oforigin/masterup to github for safekeeping under the namelatest_origin_master, but it’s not clear if that’s what you’re wanting, especially since bothoriginandtruekonradsare already on github.Given your output above, it seems that
originandtruekonradsare defined identically, which is redundant.