How to handle code conflicts?
Options
- Mark as New
- Bookmark
- Subscribe
- Mute
- Subscribe to RSS Feed
- Permalink
- Report Inappropriate Content
06-22-2025 10:01 AM
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).
1 REPLY 1
Options
- Mark as New
- Bookmark
- Subscribe
- Mute
- Subscribe to RSS Feed
- Permalink
- Report Inappropriate Content
06-23-2025 04:32 AM
Hi @Suggy
- Use the Compare feature to identify differences.
- Manually copy and merge the relevant code into the current version.
- Test thoroughly to ensure no logic is broken.
- 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.