type
status
date
slug
summary
tags
category
icon
password
Origin Vs Upstream
1. Maintain Your Fork:
• Origin lets you manage your own copy, push your changes, and manage branches.
2. Stay Updated with the Original Repository:
• Upstream lets you incorporate updates from the original project, ensuring your fork remains up-to-date and reducing merge conflicts.
添加方式:
Upstream 操作:
将原仓库最新 与本地同branch merge
Divergence between Local and Remote
hint: You have divergent branches and need to specify how to reconcile them.
fatal: Need to specify how to reconcile divergent branches.
- Merge
- Rebase
如果从头开始就是 本地和Remote就是分别初始化的 就会有下面报错
fatal: refusing to merge unrelated histories
之后就是merge
然后会自动commit
- Author:ran2323
- URL:https://www.blueif.me//article/15c71a79-6e22-8085-9770-e2b2aaa7eb13
- Copyright:All articles in this blog, except for special statements, adopt BY-NC-SA agreement. Please indicate the source!
