Resolve version files conflicts during forward flows

[premun]

• Extends the test to also account for conflicts in the forward flow
• Conflict resolution will change a bit in the future but the test and most of the other changes will stay

#4345

Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.

Comments suppressed due to low confidence (4)

src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/VmrForwardFlower.cs:444

• [nitpick] The error message 'Auto-resolving conflict in {file} using PR version' could be more descriptive. Consider specifying what 'PR version' refers to.

_logger.LogInformation("Auto-resolving conflict in {file} using PR version", filePath);

src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/VmrForwardFlower.cs:465

• The use of '..' in the line '..conflictedFiles.Where(f => f.Path.ToLowerInvariant().StartsWith(Constants.CommonScriptFilesPath + '/'))' is incorrect. It should be a single dot '.' to indicate the current directory.

..conflictedFiles.Where(f => f.Path.ToLowerInvariant().StartsWith(Constants.CommonScriptFilesPath + '/'))

test/Microsoft.DotNet.Darc.VirtualMonoRepo.E2E.Tests/VmrTwoWayCodeflowTest.cs:281

• [nitpick] The variable name 'shaInStep6' is ambiguous. It should be renamed to 'commitShaInStep6' for better clarity.

var shaInStep6 = await GitOperations.GetRepoLastCommit(ProductRepoPath);

test/Microsoft.DotNet.Darc.VirtualMonoRepo.E2E.Tests/VmrTestsBase.cs:381

• [nitpick] The reassignment of the 'commit' variable could be confusing. Consider renaming the reassigned variable to 'resolvedCommit'.

commit ??= await GitOperations.GetRepoLastCommit(repoPath);