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

How do I fix this 'dangling' feature?

Deleted user Dec 01, 2015

Hi,

I am using the GitFlow, menus.  I started a feature, completed it, and then tried to end the feature in SourceTree.  This failed with an error.  The error was just some kind of permissions problem on files that should have been ignored in the first place.

I have now ignored the offending files, but I now don't have the option to finish the feature.  Worse, if I try a manual merge, I get the same error that caused the problem in the first place.

I have included an image of the current state of the branch tree.  Can anyone help me to tidy this up, please?

SourceTree.PNG

Kind wishes ~ Patrick

2 answers

Try using the Discard button.

0 votes
Deleted user Dec 01, 2015

Thank you for the answer, Seth.  It is currently greyed-out, but that could be because of my attempts to fix the problem.  Not used that button before. Always been scared of it.  I'll have to read the docs about it.

 

I think I have fixed my problem another way.  The actual error I was getting was a stat error (as discussed here stat-file-permission-denied).  It suggested that it could be a file-locking issue, so I closed Visual Studio and the error went away.  I was then able to finish the feature by doing the merges manually.  I'm pretty sure the project and even the history are how they should be.

 

Funny, even back in the days when I used SourceSafe (no longer around), which was  Microsoft product, I recall that the only really safe way to do large source control operations was to close Visual Studio first.

 

  • Patrick

 

 

 

Suggest an answer

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

Sourcetree for Windows - CVE-2019-11582 - Remote Code Execution vulnerability

A vulnerability has been published today in regards to Sourcetree for Windows.  The goal of this article is to give you a summary of information we have gathered from Atlassian Community as a st...

663 views 0 9
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