I wasn't sure if it really meant what it appears to mean: "what you see in the files tab might not be what you end up with". A PR reviewer might reasonably expect to be looking the final result, so it seems counter-intuitive that DevOps might show files in anything other than their final state.
But equally, I couldn't think of anything else it might mean.
I wasn't sure if it really meant what it appears to mean: "what you see in the files tab might not be what you end up with". A PR reviewer might reasonably expect to be looking the final result, so it seems counter-intuitive that DevOps might show files in anything other than their final state.
But equally, I couldn't think of anything else it might mean.
Share Improve this question edited Mar 22 at 9:18 riQQ 13k7 gold badges66 silver badges76 bronze badges asked Mar 19 at 3:26 OutstandingBillOutstandingBill 2,9101 gold badge30 silver badges38 bronze badges2 Answers
Reset to default 0TLDR; It means "the Files tab does not show the head of the target branch before and after the merge". I haven't managed to figure out exactly what it does show, but it seems to be something like the head of the target branch minus conflicted changes.
I ran an experiment. In branch-A, I did this:
In the same file, in branch-B, I did this:
I merged branch branch-A into main, then created a PR to merge branch-B into main. There was a conflict, which I resolved in DevOps like this:
The PR represents the change like this in the files tab:
But in the final result, the file contains this:
using System; // feature/test-merge-conflicts-1ab
It means that changes made to conflicted files when using conflicts extension will not be shown in the "Files" tab.
You resolve the conflicts from "Conflicts" tab, which is actually an extension installed into your anization Pull Request Merge Conflict Extension. It's a known issue with this extension that "Updates to conflicted files are not shown in the "Files" tab".