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

相关推荐
@卞2 小时前
版本控制器 git(5)--- git 标签管理
git
鸿儒之观2 小时前
dinky提交flink任务报 java.lang.OutOfMemoryError: Direct buffer memory
大数据·flink
YangYang9YangYan2 小时前
理财经理的职业进阶:核心技能与成长路径解析
大数据·金融·数据分析
shinelord明2 小时前
【大数据开发实践】Kafka REST Proxy~无缝集成 Kafka
大数据·分布式·架构·kafka
灰飞肥鱼3 小时前
rebase 与 merge
git
cyh男3 小时前
为什么ES中不推荐使用wildcard查询
elasticsearch·lucene
19岁开始学习3 小时前
PHP操作elasticsearch7.8
elasticsearch·jenkins·php
笨蛋少年派4 小时前
操作Hadoop时,慎用sudo
大数据·hadoop·分布式
青云交4 小时前
Java 大视界 -- Java 大数据在智能家居设备联动与场景自动化中的应用
java·大数据·智能家居·数据采集·设备联动·场景自动化·逻辑实现
武子康4 小时前
大数据-123 - Flink 并行度设置优先级讲解 原理、配置与最佳实践 从Kafka到HDFS的案例分析
大数据·后端·flink