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

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

Suggest an answer

Log in or Join to answer
Community showcase
Piotr Plewa
Published Dec 27, 2017 in Bitbucket

Recipe: Deploying AWS Lambda functions with Bitbucket Pipelines

Bitbucket Pipelines helps me manage and automate a number of serverless deployments to AWS Lambda and this is how I do it. I'm building Node.js Lambda functions using node-lambda&nbsp...

681 views 0 4
Read article

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
Atlassian Team Tour

Join us on the Team Tour

We're bringing product updates and pro tips on teamwork to ten cities around the world.

Save your spot