Source tree commit overwrites previous changes without a conflict warning

Hi,

We are using stash for managing git and source tree for GUI. For most part it work good but some times it overwrites the previous changes without any conflict message. This happens when a single file is being written by more that 1 person.

Is anyone have observed such kind of behaviour or is there any specific settings using which we can use minimize the such posibility.

Thanks,

Vikrant

1 answer

This widget could not be displayed.

If you always either commit or stash any pending changes before pulling, this will not be a problem.

Suggest an answer

Log in or Sign up to answer
Atlassian Summit 2018

Meet the community IRL

Atlassian Summit is an excellent opportunity for in-person support, training, and networking.

Learn more
Community showcase
Posted Aug 10, 2018 in Bitbucket

What is your #1 piece of advice to new users getting started using Bitbucket?

Hello Community! My name is Claire Maynard, and I’m a Product Marketing Manager on the Bitbucket team. I’m interested in hearing what advice or tips you have for new users getting started on ...

246 views 14 2
Join discussion

Atlassian User Groups

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

Find a group

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

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you