Here's what my screen looks like right now:
$ git checkout code-cleanup
Switched to branch 'code-cleanup'
Your branch is ahead of 'origin/code-cleanup' by 6 commits.
(use "git push" to publish your local commits)
b.gust@AHA-DT-BGUST2 MINGW64 /c/wamp64/www/bsmart (code-cleanup)
$ git pull
Already up to date.
Now, according to this, my local version of "code-cleanup" is 6 commits ahead of what's on the remote repository. Whatever those commits are, they need to be overwritten by what's on the remote repository. I've got guys on my team who've made some updates and it's that version which needs to be the foundation I'm building on.
So, I do a git pull and I'm thinking this is replacing whatever I have with the "newest and coolest."
But then it says, "Already up to date."
How does that work if I'm six commits ahead of what's on the remote repository?
Do you hear my dilemma?
How do I ensure that my local "code-cleanup" is a mirror image of what's on the remote repository?
PS: My local changes can be overwritten...