Inter-branch merge workflow failing in sourcelink and ResetToTargetPath still causes conflicts

[ViktorHofer]

See https://github.com/dotnet/sourcelink/actions

Also, the ResetToTargetPath functionality seems to not work as intended as it still shows conflicts in files listed here: https://github.com/dotnet/sourcelink/blob/c23996c885a40466b8e6153efbe4662421cdaef5/github-merge-flow.jsonc#L30-L34

cc @mmitche

[mmitche]

@ViktorHofer it might be that the two are related. The ResetToTargetPaths functionality appears to be correctly checking out the HEAD of the target branch, however the update can't be pushed because the merge branch couldn't be updated (doesn't have the latest). So maybe that leave conflicts in certain cases?

It might be that the right thing to do is to have the workflow attempt to merge in the latest changes from the origin. However, it's still possible to get into a bad state if a user force pushes to the merge branch (or if timing is just off). You don't want to force push in case there is work in progress in the PR.