How to use checkout correctly so that there is no conflict when sending files?

Question

git

How to use checkout correctly so that there is no conflict when sending files? Explain who and when should checkout?

Answer 1

There will be a conflict, but it should be during the pull. Let's say we're on the master branch:

git commit -m "Мои изменения"
git pull
/// резолвим конфликты
git commit -m "Конфликты зарезолвены"
git push

The one who makes the pull is reactive, but he can call for advice from anyone who needs it. In the case of git-flow, the developer works in the feature-branch

git commit -m "Мои изменения"
git pull
/// резолвим конфликты с другими разработчиками, которые разрабатывают feature
git commit -m "Конфликты зарезолвены"
git merge develop
/// резолвим конфликты с мастером
git commit -m "Конфликты с основной веткой зарезолвены"
git push

After that, you can make a pull-request to the develop branch. If the branch changes and conflicts appear again - again we do merge in feature-branch and push, Pull Request for example on GitHub will be updated automatically