Skip to content

Commit da082fd

Browse files
dkurepaadamzip
andauthored
Update src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/VmrForwardFlower.cs
Co-authored-by: Adam <[email protected]>
1 parent 9df1120 commit da082fd

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ protected override async Task<bool> OppositeDirectionFlowAsync(
274274

275275
// TODO https://github.com/dotnet/arcade-services/issues/5030
276276
// This is only a temporary band aid solution, we should figure out the best way to fix the algorithm so the flow continues as expected
277-
await ValidateNothingGetsOverwritten(sourceRepo, headBranch, targetBranch);
277+
await CheckManualCommitsInBranch(sourceRepo, headBranch, targetBranch);
278278

279279
// We will remove everything not-cloaked and replace it with current contents of the source repo
280280
// When flowing to the VMR, we remove all files but the cloaked files

0 commit comments

Comments
 (0)