Provide Branch information in Conflict Resolution Dialog
Update the Conflict Resolution dialog to include additional information about the conflict.
In particular, it would be helpful during a branch merge to know which branch is being considered as the Source and which is the Destination.
In the attached example, it would be helpful to know that the Delete operation occurred on the /develop branch, and the change operation occurred on the /develop/tileeffectsupdate child branch.
This will further clarify and confusion about which action to perform.