Hello,

Can we avoid merge conflicts by using the diffing capabilities in the commit view instead of looking at the diffing capabilities in the standard PR view?

I find that I can always see the differences to the files by looking at the commit view when there is a merge conflict. If we could use the diff that we see in the commit view instead, then we can avoid merge conflicts.

If more detail or clarity is required then please let me know.