I was fortunate enough to encounter many tree conflicts with myself recently in this project that I am working on. I want to know what is the best and easiest way to resolve a tree conflict if I want to save only local changes. Thanks.
Right-click File> Edit Conflicts> Mark As Allowed.