Daniel, the first script I sent may confuse things a little, because of
the tree conflict.
Here is another script that avoid that issue. The problem is the same:
it looks like the mergeinfo does not match the state of the branch.
-start of 2nd script
@ECHO off
REM -- Script to test handling
Hi Team,
I am getting this below error message while doing checkout on local machine.
Please let me know how to fix this problem.
[cid:image001.png@01D866CB.1E127530]
Regards,
Prakash
-Original Message-
From: Christophe Royer
Sent: Friday, May 13, 2022 5:11 AM
To: Daniel Sh
