Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Deleted user
0 / 0 points
Next:
badges earned

Your Points Tracker
Challenges
Leaderboard
  • Global
  • Feed

Badge for your thoughts?

You're enrolled in our new beta rewards program. Join our group to get the inside scoop and share your feedback.

Join group
Recognition
Give the gift of kudos
You have 0 kudos available to give
Who do you want to recognize?
Why do you want to recognize them?
Kudos
Great job appreciating your peers!
Check back soon to give more kudos.

Past Kudos Given
No kudos given
You haven't given any kudos yet. Share the love above and you'll see it here.

It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

Re: Re: Fix a detached head / lost master branch? Edited

Hello Seth,

I think I have a similar problem to Wolfgang, and your answer to him was so clear I thought I would write to you also.

I inadvertently created a detached head by trying to checkout a previous version of my work to look at something. I didn't understand the warning in the resulting dialog box, and I clicked "OK" and accidentally created the detached head.

I followed your instructions above, and renamed the most recent commit on the detached head and called it "v1.4.2". Then I went to merge it back into the "develop" branch as you suggest. But for reasons I don't understand, the top node of the develop branch seems to have all the cumulative changes I made since May 13, 2019 on the file "PBS_Controller.ino" in an uncommited state. 

When I went to merge branch v1.4.2 into the develop branch, I got an error saying I would have to stash or commit all of my changes in the develop branch before merging. I don't know whether it is safe to do such a commit.

Here's what I do know: The latest version checked in on the detached head/v1.4.2 branch of Nov 4 is true and correct. So my questions is, can I safely commit the uncommited changes on the develop branch, and THEN merge the v1.4.2. branch into it without losing anything, and then be all back to normal on the develop branch?

Obviously I am a novice user and would appreciate any help you could give. Thank you.

 

Sourcetree branch issue.JPG

0 answers

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published in Sourcetree

Tip from the team: configure your repos for hosting goodness!

Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...

3,270 views 4 5
Read article

Community Events

Connect with like-minded Atlassian users at free events near you!

Find an event

Connect with like-minded Atlassian users at free events near you!

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you