git Merge made by the 'recursive' strategy

From gitee.com:xxxxx/cms
 * branch            develop    -> FETCH_HEAD
Merge made by the 'recursive' strategy.
 api/controller/v1/Practice.php | 1 -
 1 file changed, 1 deletion(-)

解决办法:

方法一:

就是本地没有远程分支一一对应

git Merge made by the 'recursive' strategy_第1张图片

出现“Merge made by the 'recursive' strategy.”,因为在本地提交后没有切换分支,直接pull代码,导致分支切换后拉取、合并出现问题,可在本地分支先执行“git rebase dev”,再切换远程分支pull代码

方法二:

重新合拼一次或者在这里重发请求

 

GIT命令:https://blog.csdn.net/haibo0668/article/details/99690269

你可能感兴趣的:(linux系统,码云)