This is a slightly difficult problem but it has been solved in other places. When I update my computer with linux sometimes I will get a message saying that upstream has changed a config file that I have also modified and it asks if I want to keep my version, keep upstreams version or open it in an editor.