Hi everyone. Right now I have a copy of ServUO on my desktop, edited with all of my old custom shard stuff, and want to start merging new updates. What would be the best way to go about that? All I've been doing is copy and pasting each file from the list of updates on GitHub and merging them to my copy of ServUO with WinMerge. I did some digging and saw that I can use something like Tortoise but when I make my ServUO copy a repo the structure of everything gets jumbled and then when I go to compare differences with the logs, it only compares to the last commit on GitHub and not my local files. Can someone provide some advice?