I'm relatively new to git, and I think I broke my master. Hopefully, someone can help me untangle it.
I have my master on GitHub, and local master and tracking branch on my dev system. I also have the master on my QA system.
On my dev system, I committed my local branch and merged it into (local) master, then pushed master to origin/master at GitHub. Then, I pulled master to the QA system. Then, I made some further changes to my local branch.
What I did was:
dev branch -- merge --> dev master
dev master -- push --> GitHub master -- pull --> QA master
I think I should have done:
dev **branch** -- push --> GitHub **branch** -- pull --> QA **branch**
Is that right?
Now: I want to revert the QA and GitHub master back before the commit ... in effect, back out that whole merge. Then, I want to push the branch (not the master) up to GitHub, and pull the branch to QA.
- How do I revert the masters on QA and on GitHub?
- Do I also need to revert the master on development?
- How do I preserve the branch changes I've made on development?
Help, please?