Changes which get immediately reverted get un-reverted again

[premun]

Pull request

dotnet/dotnet#6619

Type of problem

Incorrect contents in the PR

Description of the issue

In the PR above, a file was changed in these highlighted commits:

Then, in the next forward flow, which is opposite flow to the top red backflow, where the aspnetcore repo didn't touch this file, this file got reverted to the state from the aspnetcore.

I think it's just the fact that the file change is part of the flow commit that the opposite direction algorithm reverts it back.

[adamzip]

It looks like the new FF was branching off from the wrong commit in the target repo?
This is the PR branch: https://github.com/dotnet/dotnet/commits/darc-main-327afdd0-5bd9-4bd3-8579-146559e74475/

It contains commit da95a2c, which means that it was applied after Alex's changes, from a repo commit that hadn't received those changes yet.

What should've happened is that it would've branched off from the last backflow commit on the VMR, and then Alex's changes aren't reverted because they're not even on the branch yet.

[premun]

With rebase, the FF branch gets created in the point of the last sync, and then we rebase it on top of the target branch