Show HN: Merge folders and simulate merging–count of conflicts, trumps, and newgithub.com/chapmanjacobd1 pointxk33 years ago