Since one or two BC4 updates ago, TortoiseSVN on Windows stopped recognizing the merge output when resolving an Update conflict.
Previous BC4 versions worked just fine. I guess something changed, nor do I know how TortoiseSVN detetcs the newer merged output.
For the moment, I have to save the merge output as normal, then on Tortoise right-click on Mark As Resolved; previously I didn't need to do this.
Thanks, have a nice day,
Humberto
Previous BC4 versions worked just fine. I guess something changed, nor do I know how TortoiseSVN detetcs the newer merged output.
For the moment, I have to save the merge output as normal, then on Tortoise right-click on Mark As Resolved; previously I didn't need to do this.
Thanks, have a nice day,
Humberto
Comment