To prevent overwrite other members working file

[w...@cloudlendinginc.com]

My question is tricky.

Some of my colleagues are working on the same ORG.

We will modify the same file(classes) sometimes.

Is there any solution to avoid overwrite by saving current working file.

I mean is there any possible to prevent commit file to ORG if any confliction happens?

thanks

[Scott]

Hi, Wei.  Illuminated Cloud actually features conflict detection as a first-class feature.  In the connection configuration screen, you can check Check for Conflicts on Deployment and then choose a login sharing model, either Dedicated Logins if each user has his or her own login or Shared Logins if users are logging in with the same set of credentials.  The former checks to see if another user has last modified metadata requested for deployment; the latter checks to see whether the metadata has been modified since the last successful deployment or retrieval.

Please let me know if that doesn't give you what you need.

Best regards,

Scott Wells

[Joan Ferreras]

Hello everyone, reviving an old thread.

I need to take advantage of this feature as well since we are sharing the same org. I have checked "Dedicated Logins".

I tested this feature by login in to the org as my colleague and making a change to a class. Afterwards, on the same class, I hit ctrl+s from IntelliJ in order to force a conflict.

Sometimes nothing happens on the first save, but then on the second it will deploy and overwrite my colleague's work. I expected an error or popup letting me know of a conflict and possibly allow me to resolve it locally and then deploy my changes.

I am new to using Illuminated Cloud so any help is welcome!

Thank you.

[sc...@illuminatedcloud.com]

You may have already read this, but there's quite a bit of detail on how IC's conflict detection works here:

http://www.illuminatedcloud.com/home/deployment

If properly configured for the user access model, it should not be possible to overwrite another person's changes by saving from IC (unless, of course, there's a bug which I would call critical and would address ASAP). When potential conflicts are detected, you will be told which file(s) conflicted and given the option to force your changes to overwrite, retrieve the server's version for comparison, or canceling the operation. If you choose the second option, the next deployment of that same metadata will not check for conflicts assuming you've reconciled any differences after the retrieve/compare cycle.

Let's check a few config things to see if you're set up correctly, and if not, let's get those changed and see if it helps. First, you mentioned that you've enable conflict detection for dedicated logins. I won't repeat the details from the link above, but if you have more than one person logging into this shared org with the same credentials, please change that to shared logins to ensure that the correct conflict detection strategy is used. Also, you mentioned that sometimes you save and nothing happens. Please make sure that under Validation and Deployment settings, you have enabled Override Save All action. The reason for that is also given in the link above, but basically if you want reliable deploy-on-save, you must enable that option.

If you have all of these set up as described above and you're still seeing the issue, please enable debug logging for metadata deployment as described here:

http://www.illuminatedcloud.com/support/debuglogging

then reproduce issue, and finally send me the resulting idea.log file using Help>Show Log in Explorer/Finder/Files. Feel free to email it to sup...@illuminatedcloud.com if it contains private information vs. posting it here. That will show the conflict detection logic applied so we can see what might be happening.

I hope this helps. Please let me know your findings either way, and if there are things I need to investigate/address in IC, let's just gather the necessary details so I can do so.

Best regards,

Scott Wells

[Joan Ferreras]

Hi Scott,

Thanks for such a quick reply and for doing so while on vacation. I hope all is great!

I verified that I configured my environment as the guide shows so I will send an email with the log file.

Very grateful.

Cheers!