Problem

We have detected cases when the source-manifest.json is conflicting with the target branch because it has many edits to repository records instead of the one corresponding to the current flow.

When the codeflow algorithm flows sources, it then tries to merge the target branch and resolve conflicts.
When it's resolving source-manifest.json, it loads the target branch file and makes that one edit that belongs to the current flow.

I think it might get the tip of the target branch instead of the merge base with the PR branch.
So if it gets the tip and not the merge base, the PR branch then gets additional changes and once the target branch changes again, it starts conflicting.

Goal

Confirm the theory above and if true, use the merge-base version of source-manifest.json.

Example PRs

• [release/10.0.2xx] Source code updates from dotnet/arcade dotnet#4756
• [release/10.0.2xx] Source code updates from dotnet/arcade dotnet#4730