Using meld to merge folders
More of a note to myself than a post, today I found that I had 5 wygibtwys folders shattered on different computers.
Some of my website projects had forked in the splitting process, and while I considered sdiffing my way out of it, the sheer number of files (over 1000) made me look for a quicker alternative.
I found meld to be very handy for the task at hand, namely with the 3-way comparison, it allowed me to merge everything in less than 10 minutes.
More info on the official Meld website, or just install as usual "pkg install meld".