VBS - Merge Conflict Resolution best way

Hi Team,

We’ve been encountering frequent merge conflicts during our development process, especially when multiple rules exist on the same page. Currently, we’ve been resolving these conflicts by retaining our version and discarding the incoming changes. However, we’re not entirely confident that this is the correct or sustainable approach.

We would appreciate your guidance on the following:

• Best practices for resolving merge conflicts without affecting existing rules.
• Step-by-step documentation or video tutorials that can help us understand and manually resolve conflicts more effectively.
• Any suggestions on how to avoid frequent conflicts

This has been a recurring challenge for us, and we’re keen to adopt a more reliable and collaborative method moving forward.