git pull问题 git config pull.rebase false
错误如下:
Unable to pull because your local and remote branches changed. Set your preferred Git behavior for how to reconcile diverged branches in Git settings. git: 'credential-manager' is not a git command. See 'git --help'. The most similar command is credential-manager-core Hint: You have divergent branches and need to specify how to reconcile them. Hint: You can do so by running one of the following commands sometime before Hint: your next pull: Hint: Hint: git config pull.rebase false # merge Hint: git config pull.rebase true # rebase Hint: git config pull.ff only # fast-forward only Hint: Hint: You can replace "git config" with "git config --global" to set a default Hint: preference for all repositories. You can also pass --rebase, --no-rebase, Hint: or --ff-only on the command line to override the configured default per Hint: invocation.
执行下红色字体就可以了
【推荐】国内首个AI IDE,深度理解中文开发场景,立即下载体验Trae
【推荐】编程新体验,更懂你的AI,立即体验豆包MarsCode编程助手
【推荐】抖音旗下AI助手豆包,你的智能百科全书,全免费不限次数
【推荐】轻量又高性能的 SSH 工具 IShell:AI 加持,快人一步
· 【自荐】一款简洁、开源的在线白板工具 Drawnix
· 没有Manus邀请码?试试免邀请码的MGX或者开源的OpenManus吧
· 园子的第一款AI主题卫衣上架——"HELLO! HOW CAN I ASSIST YOU TODAY
· 无需6万激活码!GitHub神秘组织3小时极速复刻Manus,手把手教你使用OpenManus搭建本
· C#/.NET/.NET Core优秀项目和框架2025年2月简报
2021-09-20 nancy03--整合记录(net core版本)
2021-09-20 ToString("X2")的含义及使用
2021-09-20 Nancy02
2021-09-20 c# 获取当前程序运行根目录
2021-09-20 Nancy异常01