ParentFull threadjonlarson·Merging? If you have 2 dozen authors collaborating, there's bound to be people working on the same files.View on HN