File Conflict Check

We are noticing an issue where the file conflict check (if the file has been modified on the server since you started making changes) is not working in certain cases.  It seems to work for users in the same time zone, but we have a developer in a different time zone who is seemingly being allowed to overwrite changes and not receiving an error message about pulling the latest.

Could this time zone difference be the issue?  Not really sure what is going on here, but that is our first thought.

How is the file conflict check done?

Thanks!

Hi.

Thank you for sharing this case with us.

Our team faces with such case at first.

The differences in the time zones cannot be the reason for your issue.

During the file conflict check the time of the last changes in the file on the server and saved one locally is compared. If it is different, then you get the message about the presence of changes in your file in comparison with it’s previous (pulled) version.

May I please ask you to tell us which type of files is overwritten?

If this is possible can you please describe whole process step-by-step who does a changes, pull, and build operations in which order.

We will appreciate your help with this.

Thank you,

Kate

It was a static resource file (javascript).

User in Chicago edited the file with mavensmate.]

User in Chicago saved the file with mavensmate.

User in Chicago verified his changes were saved to Salesforce.

User in Argentina edited the file with Welkin Suite.

User in Argentina saved the file with Welkin Suite and received no errors.

User in Chicago noticed his changes were missing.

Hi.

Thank you for your answer.

I’ll add these details to our investigation process.

This issue is already included to our current sprint, and TWS team is working on this.

I’ll keep you updated.

Thank you,

Kate

Hi.

I want to inform you about our investigation process.

TWS team couldn’t find the concrete reason for this issue. At the same time we have released several fixes of conjectural reasons for the overwriting the code during the pull process without conflict check in the 0.24.13 and 0.25.3 versions of the IDE.

At this stage we stopped the investigation.

Can you please notify us if this issue is solved for you.

If the case is reproduced we will continue to look what goes wrong.

Thank you,

Kate