conflict merge precheck feature for local changes vs a remote branch head

[janfjohannes]

req: in fink we need a way to show warnings based on the actual impact that a fork diversion has, if we can merge automatically without conflicts we can have an optimized workflow

@NiklasBuchfink please add additional requirements or corrections here