Conflict 1:
hint: Updates were rejected because a pushed branch tip is behind its remote
hint: counterpart. Check out this branch and integrate the remote changes
hint: (e.g. 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.Resolution:
git checkout your_branch
git pull
# resolve any conflict here
# after resolving conflict, commit
git commit
git rebase --continue
git push