Did you make sure NO .idea files are in your GitHub repository?
Yes
How do you manage commits to avoid problems?
Everyone pulls before they commit, and will communicate to teammates what they're currently working on
Have you considered branching techniques with pull requests?
Yes, we've decided not to use them because they add unnecessary complications. So long as everyone sticks to their assigned technical and pulls before they push, there shouldn't be any problems.
What actions will you take this Trimester to get better at managing merge or commit problems?
Communicate with teammates, discuss what we're working on in order to prevent merge/commit issues