I am trying to push to a repo that some merged in changes not in my local.
error: failed to push some refs to 'git@git.corp.myrepo'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
I remember using in the past a way to pull
using rebase
to resolve this easily where it would pull and also merge your commits.
What is the best way to resolve this?