Source tree commit overwrites previous changes without a conflict warning

[Vikrant Singh]

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

[Balázs Szakmáry]

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