merge into develop (develop merge into local branch) resolve conflict git checkout develop git pull merge into current (local branch merge into current develop) git push git checkout my_branch continue coding