git push to a remote repository - "Unable to perform non fast forward merge on target. Please pull or fetch and merge manually."

2014 9 22
1 个回答
回答已采纳
更新时间：2014 9 22
10 次查看（30 天）

0 个投票

When using Git integration with Simulink Projects, and performing a push to a remote repository, you may get the following "Unable to perform non fast forward merge on target. Please pull or fetch and merge manually."

请先登录，再回答此问题。

 采纳的回答

David
David 2014-9-22

0 个投票

The message "Unable to perform non fast forward merge on target. Please pull or fetch and merge manually" usually means that your origin branch is not up to date; or in other words, someone else has submitted to the remote repository since you created your repository and you are not up to date. You need to push the fetch button to update your origin branch and then merge the origin branch into your local branch.
For instance if you are on the master branch, push fetch, open the branch manager, select origin/master and select merge. Then you need to resolve any conflicts and perform a commit. You might not have any conflicts, but if you do they need resolving.
Once you have done this you will be able to do a push.

更多回答（0 个）

类别

在 帮助中心 和 File Exchange 中查找有关 Project Management 的更多信息

标签

Community Treasure Hunt

Find the treasures in MATLAB Central and discover how the community can help you!

Start Hunting!

Translated by