I was trying to merge from one branch(B1) to another(B2). I have followed the given steps:
Right click on the folder -> Merge... -> Merge two different trees -> From B1 to B2 (HEAD Revision) -> Merge(checked Compare white spaces option by default)
Merge finished with tree conflicts.
The issue is I am not able to find any of the conflicted files inside my folder. But the folder is having the conflict mark on it. Is there anything wrong in the above steps?
You must not use "Merge two different trees" in order to merge B1 to B2. "Merge two different trees" merges A+B into (unrelated to A||B) C node