Merge Conflict : How to leverage the Bubble functionality in Resolve Conflict code window
Summary:
There is a bubble functionality which seems to be useful for resolving conflicts by selecting the most relevant version of code once a Merge Conflict occurs.
However, we have noticed that the selection made through bubble is not always resolving the conflict accurately and there are redundant/arbitrary lines of code in the resolved version as well.
Wanted to understand the best practice for the conflict resolution for Merge Conflicts.
Content (please ensure you mask any confidential information):
Version (include the version you are using, if applicable):
24B
Code Snippet (add any code snippets that support your topic, if applicable):