[Feature Request] for Pull Request, detect conflicts

[6543]

this is part of #5158 summary ... and also on the list of #8659

[6543]

@guillep2k can you add it to your list #8659

[6543]

should we do this in Mem?
https://stackoverflow.com/a/6283843

[lunny]

I think this has been resolved by #5951

[6543]

@pjebs can you add this as checked to your #5158 ?