GIT 遇到问题

GIT 遇到问题

shell 复制代码
> git pull --tags
From https://gitee.com/gdgmzwx/react-project-demo
 * [new branch]      master     -> origin/master
There is no tracking information for the current branch.
Please specify which branch you want to merge with.
See git-pull(1) for details.

    git pull <remote> <branch>

If you wish to set tracking information for this branch you can do so with:

    git branch --set-upstream-to=origin/<branch> main

git branch --set-upstream-to=origin/<远程分支> 本地分支

git branch --set-upstream-to=origin/master main

shell 复制代码
> git pull --tags origin master
From https://gitee.com/gdgmzwx/react-project-demo
 * branch            master     -> FETCH_HEAD
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.
fatal: Need to specify how to reconcile divergent branches.

git config pull.rebase false

shell 复制代码
> git pull --tags origin master
From https://gitee.com/gdgmzwx/react-project-demo
 * branch            master     -> FETCH_HEAD
fatal: refusing to merge unrelated histories

git pull origin master --allow-unrelated-histories

@蚵仔煎-20231106

相关推荐
Cat_Rocky5 分钟前
CICD-Git简单学习 操作流程后续补
git·学习
红鲤 鱼6 分钟前
2026年5月变频器风机品牌推荐:TOP5评测严选工业散热问题指南
大数据
存在的五月雨16 分钟前
Git的操作
git
丶Darling.16 分钟前
Git 初学者使用手册
git
启道张恒18 分钟前
飞扬软件「建筑自动化·房间定义」重磅升级:重塑设计效率新标杆
大数据·人工智能·ai设计·bim正向设计·国产二三维设计软件·飞扬集成设计系统
Elastic 中国社区官方博客21 分钟前
Elasticsearch:使用预计算上下文降低 agent 成本
大数据·人工智能·elasticsearch·搜索引擎·ai·全文检索
m0_7156744325 分钟前
技术创新突破·可管可控·对标行标 医疗API安全解决方案实践指南
大数据·人工智能·安全
AllData公司负责人26 分钟前
亲测丝滑,体验跃迁|AllData通过集成开源项目RustFS,多模态数据存储新范式
java·大数据·数据库·算法·数据分析·rustfs
AI品信智慧数智人40 分钟前
AI赋能智慧文旅新赛道✨数字人定制专属伴游管家,重塑出游新体验
大数据·人工智能
SLD_Allen1 小时前
企业级 AI Agent: MCP、CLI、Skills,如何定位、该怎么选、最佳实践。
大数据·人工智能·elasticsearch·企业级 ai agent