As an educator... It seems terrible to see students spending more time in learning all about a GIT conflict & what they did wrong while using GIT... rather than spending that time to really professionalize with code! A tool to enhance collaboration/efficiency should not be about bogging students/professionals down. My vote definitely goes to Sturdy. Infact if you really dont have an enterprise software that is- large and complicated with hundreds of developers ... believe me you just need Sturdy. All students / academies should start with this and return the time to learn coding back to the students!