Come for the products,
stay for the community

The Atlassian Community can help you and your team get more value out of Atlassian products and practices.

Atlassian Community about banner
4,298,527
Community Members
 
Community Events
165
Community Groups

SourceTree deletes files during merge from another user's commit that is coming in

Hi everyone, 

I am hoping to get a good understanding of what happened to my project so it wouldn't happen again. 

We work a o master brunch as a small team (4 people). We work locally and commit + pull + push kind of work flow simply ( end of the day ). We use SourceTree a a git tool with KDiff3 as merge tool.

Recently, we experienced a work loss during a merge process of a team member as in the picture.  A set of new files which had been added by another team member were deleted during an automatic merge operation at another team members local, no manual process. Without realising the loss of the work, the merge has been pushed to the local repository and everyone has the latest merge.

In the first picture below you can see the a user adds new files to the project, the very same files we deleted during a merge process a few days later, as in the second picture. 

 

We tried to figure out what happened and couldn't find a meaningful explanation. No one deleted any files prior to it. 

I would appreciate any comments and help.

 

Kind regards,

Niyazi

 

Git issue 1 .pngGit issue 2 .png

 

 

 

0 answers

Suggest an answer

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

Bug Fix: Sourcetree for Windows authentication error when updating to app password

Hello Sourcetree users!!! With the recent removal of Bitbucket Cloud account passwords for app passwords (please see our Bitbucket Cloud community post for details on why we made this change for se...

61,995 views 127 27
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