Show HN: Merge folders and simulate merging–count of conflicts, trumps, and newgithub.com·1 pts·xk3·1