Hello, As part of a school project in Software Engineering, I had to help my team understand and use Git. Making them commit their work is fairly simple, that

Hello, As part of a school project in Software Engineering, I had to help my team understand and use Git. Making them commit their work is fairly simple, that they can do with little guidance. The problems occour when they have merge conflicts. We all worked in the same branch (stupid, I know, I didn't know better then) which created a lot of merge conflicts. The team had some issues fixing that in the beginning, but tools like SmartGit / SourceTree made their experience better. Based on my limited experiences, I would recommend the following: 1 - Start with the simple parts, checking out code and committing. 2 - Then, introduce the concept of feature branches. Do not go all the way that Git flow does in the beginning, keep it simple for now, and then, when more of the organisation understands Git, you can go over to the full Git flow model. Ensure that people focus their branches, and let them only live for a short amount of time. This so that work can be synced up regularily. 3 - What can go wrong? Show them a somewhat advanced merge conflict and how you solved it. 4 - Try to introduce it to them using a GUI client (SourceTree / SmartGit) if they're not into the Command line. It can make adoption easier and less painful. Good luck!