There's tools for Git on Windows. It's a bit slower than on 'nix, but it works.
Branch merges in Git are nearly trivial, especially if there's no conflicting changes. They kinda have to be, since each person's copy of the repo is effectively a branch... Of course you'll want to manually verify it to make sure there's no weird interactions, and if the same part of the same file was changed in both a human needs to sort that out... but those are kinda unavoidable.
____________________________
636th Trapdoor Replacer
Official Hold Progress:
Click here to view the secret text
×
King Dugan's Dungeon 2.0 - Mastered+
Journey to Rooted Hold - Mastered+
The City Beneath - Conquered, 55%
Gunthro and the Epic Blunder - Mastered+
The Second Sky - Conquered 40%
Smitemastery 101 - Mastered
Master Locks - Mastered
Devilishy Dangerous Dungeons of Doom - Mastered
Suit Pursuit - Conquered, 37%
Finding the First Truth - Conquered, 18%