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

相关推荐
Slow菜鸟2 小时前
SpringBoot集成Elasticsearch | Elasticsearch 8.x专属Java Client
java·spring boot·elasticsearch
Flash Dog4 小时前
git推送远程仓库
git
shuangrenlong4 小时前
git 快速批量cp某些提交到分支一次性合入
git
EasyCVR4 小时前
从汇聚到智能:解析视频融合平台EasyCVR视频智能分析技术背后的关键技术
大数据·人工智能
xiucai_cs6 小时前
【git】rebase 和 merge 区别及使用建议
git·rebase·merge
hqyjzsb6 小时前
2025文职转行AI管理岗:衔接型认证成为关键路径
大数据·c语言·人工智能·信息可视化·媒体·caie
行百里er6 小时前
ES8.6.2 集群部署:教你避坑,笑着搞定高可用
后端·elasticsearch·架构
sniper_fandc6 小时前
Elasticsearch从入门到进阶——分布式特性
大数据·分布式·elasticsearch
YangYang9YangYan8 小时前
大专计算机技术专业就业方向:解读、规划与提升指南
大数据·人工智能·数据分析
扫地的小何尚8 小时前
AI创新的火花:NVIDIA DGX Spark开箱与深度解析
大数据·人工智能·spark·llm·gpu·nvidia·dgx