Collaborating with git

Know the power of rebase

Rebase or merge

How to handle conflicts

Commit messages conventions

Continuous integration

Conclusion