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

相关推荐
zxfBdd5 分钟前
Spark Map算子异常处理方法
大数据·分布式·spark
白眼黑刺猬9 分钟前
如何构建 Flink SQL 任务的血缘分析
大数据·面试·职场和发展·flink
lifallen19 分钟前
Flink Agent:ActionTask 与可续跑状态机 (Coroutine/Continuation)
java·大数据·人工智能·语言模型·flink
白眼黑刺猬25 分钟前
字节二面:订单状态回撤: 支付回调延迟导致的“先退单后下单”乱序,Flink如何利用Watermark和状态处理?
大数据·面试·职场和发展·flink
johnny23330 分钟前
Git进阶:gh、gh-aw、worktree
git
希望永不加班34 分钟前
SpringBoot 整合 Elasticsearch 实现全文检索
java·spring boot·后端·elasticsearch·全文检索
risc12345637 分钟前
【Elasticsearch】副本分片(Replica Shard)的 globalCheckpoint 更新与推进机制
elasticsearch
jinanwuhuaguo1 小时前
OpenClaw v2026.4.5 深度解读剖析:安全架构的终极硬化与生态治理的范式转型
大数据·人工智能·安全·安全架构·openclaw
拾光向日葵1 小时前
天府新区通用航空职业学院2026年全新开设宠物医疗技术专业
大数据·人工智能·物联网
OPHKVPS1 小时前
Anthropic官方Git MCP服务器曝三重漏洞:提示注入即可实现文件读写与远程代码执行
运维·服务器·git