Open hmarcelodn opened 2 years ago
The behavior seems exactly right to me. Your templateA is unchanged from the original, and your templateB has new parentheses and the number 123. The 3-way merge is then to take templateB and ignore templateA, there is no conflict. Did you perhaps mean to use the different parentheses in the original?
Hello,
We are experiencing a really weird behaviour with the following example:
My expectation from the code above is to get:
However I am getting:
Notice the parenthesis is not being applied to my [Date] piece. Any clue on what's happening? I am expecting to get a conflict but its not happening.
Thanks in advanced.