Try out Beyond Compare, it will let you compare whole directories at once. Then you just have to download each repo, compare the whole thing, and merge them together. My guess is that there aren’t actually a ton of straight-up conflicts, so it should just be a matter of moving the TrueSky classes into the Gameworks build or vice versa (my guess is moving Truesky into the Gameworks branch will be easiest as it likely has less code).