我git重新建立了本地分支，但是git push失败

Question

我有一个来自开发的分支

这是怎么回事

1. 我对分支机构进行了更改并进行了推送，但是它与开发部门合并了冲突
2. 然后我将变化从开发转移到我的开发中
3. 从开发中重新定位我的本地分支机构，以解决任何合并冲突
4. 我尝试推送更改，但出现错误

To git@gitlab.com:----/--------.git  
 ! [rejected]        mybranch -> mybranch (non-fast-forward)  
error: failed to push some refs to 'git@gitlab.com:----/---------.git'  
hint: Updates were rejected because the tip of your current branch is behind  
hint: its remote counterpart. Integrate the remote changes (e.g.  
hint: 'git pull ...') before pushing again.  
hint: See the 'Note about fast-forwards' in 'git push --help' for details.```