On 29/09/16 20:53, Christian Groessler wrote: > Does anyone have a good idea how I could accomplish my task without > manually checking a huge number of files for conflicts/changes? Try https://github.com/mhagger/git-imerge Jonas