We help IT Professionals succeed at work.

How do I fix this situation in GIT?

288 Views
Last Modified: 2017-04-26
I made the mistake of making some changes on my local "develop" branch. This branch is set up so if I do "git pull," it will align with the "develop" branch on the main server.

After realizing my mistake, I went ahead and committed my changes, then I renamed the "develop" branch to management/server. My rationale was that I change the name of the branch, create a new branch called "develop" and do a "git pull" to grab all of the files from upstream and I would be good to go. When I did that, however, I got an error that said:

"There is no tracking information for the current branch. Please specify which branch you want to merge with."

Not sure what that meant, but I went online and found a command that seemed to do the trick. I did this:

git branch -u upstream/develop

Thing is, my interface says I'm still one commit ahead of upstream. I want to overwrite what I've got on my local "develop" branch with the "develop" branch that's sitting on the main server.

How?
Comment
Watch Question

Jeffrey Dake Senior Director of Technology
CERTIFIED EXPERT
Commented:
Unlock this solution and get a sample of our free trial.
(No credit card required)
UNLOCK SOLUTION
Top Expert 2015
Commented:
Unlock this solution and get a sample of our free trial.
(No credit card required)
UNLOCK SOLUTION
Unlock the solution to this question.
Thanks for using Experts Exchange.

Please provide your email to receive a sample view!

*This site is protected by reCAPTCHA and the Google Privacy Policy and Terms of Service apply.

OR

Please enter a first name

Please enter a last name

8+ characters (letters, numbers, and a symbol)

By clicking, you agree to the Terms of Use and Privacy Policy.