You're on your way to the next level! Join the Kudos program to earn points and save your progress.
Level 1: Seed
25 / 150 points
1 badge earned
Challenges come and go, but your rewards stay with you. Do more to earn more!
What goes around comes around! Share the love by gifting kudos to your peers.
Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!
Join now to unlock these features and more
The Atlassian Community can help you and your team get more value out of Atlassian products and practices.
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.