Also, we have a course for this very purpose! https://www.gamedev.tv/p/git-smart-course/?coupon_code=GAMEJAM_OFFER
The key to not stepping on each other's toes is to not be working on the same files at the same time. Divide up the work and have a seperate scene file each as scene files are impossible to merge.