How to handle code conflicts?

[Suggy]

Have you come across code conflicts? If yes, how are you handling/managing? (Same script record could be updated by 2 or more developers at same time).

[Roshnee Dash]

Hi @Suggy 

1. Use the Compare feature to identify differences.
2. Manually copy and merge the relevant code into the current version.
3. Test thoroughly to ensure no logic is broken.
4. Or else copy the code from the version list of both user's and use external tool to merge it to assist with merging and syntax highlighting.