I don't know but I fear that - if done automatically - it might want to keep the most recent changes of both branches. Unfortunately, there are way too many text changes involved to manually decide on a case-by-case basis if we're in a hurry... Easier said than done. Although I've made some tests I haven't been able to retrieve a set of text files of master from last year yet which I'd use for comparison with the branch Large_Rivers to clearly identify all differences. A better tool than Winmerge would help, too. I work only with text files from the branch Large_Rivers.