13. Работа с Git

commit best practices;
resolve conflicts;