We used discord as well and we used git to manage the code we worked on but even with just two people working on code we had to merge it manually quite often. I imagine this was a nightmare with so many people working together (likely for the first time) on such a short deadline. Well done!
