如何更新具有未被接受的某些提交的拉出请求的分叉回购
如何更新具有未被接受的某些提交的拉出请求的分叉回购
提问于 2020-05-04 03:15:36
我学习了下一个教程https://medium.com/@topspinj/how-to-git-rebase-into-a-forked-repo-c9f05e821c8a
这是我真正的回购：
如您所见，在我的拉请求中有两个提交，在原始存储库中有一个提交。
我想更新我的分叉存储库，以使它们在上次提交时所做的更改
在运行git fetch命令以改变我的git状态之前，请告诉我：
$ git status
En la rama 13.0
Tu rama está actualizada con 'origin/13.0'.然后我把git遥控器加到上游
git remote add upstream https://github.com/original-repo/goes-here.git一切都很好。
然后，我把git取到上游，得到了以下结果
remote: Enumerating objects: 2556, done.
remote: Counting objects: 100% (2556/2556), done.
remote: Total 3297 (delta 2556), reused 2556 (delta 2556), pack-reused 741
Recibiendo objetos: 100% (3297/3297), 2.05 MiB | 4.76 MiB/s, listo.
Resolviendo deltas: 100% (2822/2822), completado con 1802 objetos locales.
Desde https://github.com/odoo/odoo
* [nueva rama] 10.0 -> upstream/10.0
* [nueva rama] 11.0 -> upstream/11.0
* [nueva rama] 12.0 -> upstream/12.0
* [nueva rama] 13.0 -> upstream/13.0
* [nueva rama] 5.0 -> upstream/5.0
* [nueva rama] 6.0 -> upstream/6.0
* [nueva rama] 6.1 -> upstream/6.1
* [nueva rama] 7.0 -> upstream/7.0
* [nueva rama] 8.0 -> upstream/8.0
* [nueva rama] 9.0 -> upstream/9.0
* [nueva rama] master -> upstream/master
* [nueva rama] saas-1 -> upstream/saas-1
* [nueva rama] saas-10 -> upstream/saas-10
* [nueva rama] saas-11 -> upstream/saas-11
* [nueva rama] saas-11.1 -> upstream/saas-11.1
* [nueva rama] saas-11.2 -> upstream/saas-11.2
* [nueva rama] saas-11.3 -> upstream/saas-11.3
* [nueva rama] saas-11.4 -> upstream/saas-11.4
* [nueva rama] saas-11.5 -> upstream/saas-11.5
* [nueva rama] saas-12 -> upstream/saas-12
* [nueva rama] saas-12.1 -> upstream/saas-12.1
* [nueva rama] saas-12.2 -> upstream/saas-12.2
* [nueva rama] saas-12.3 -> upstream/saas-12.3
* [nueva rama] saas-12.4 -> upstream/saas-12.4
* [nueva rama] saas-12.5 -> upstream/saas-12.5
* [nueva rama] saas-13 -> upstream/saas-13
* [nueva rama] saas-13.1 -> upstream/saas-13.1
* [nueva rama] saas-13.2 -> upstream/saas-13.2
* [nueva rama] saas-13.3 -> upstream/saas-13.3
* [nueva rama] saas-14 -> upstream/saas-14
* [nueva rama] saas-15 -> upstream/saas-15
* [nueva rama] saas-16 -> upstream/saas-16
* [nueva rama] saas-17 -> upstream/saas-17
* [nueva rama] saas-18 -> upstream/saas-18
* [nueva rama] saas-2 -> upstream/saas-2
* [nueva rama] saas-3 -> upstream/saas-3
* [nueva rama] saas-4 -> upstream/saas-4
* [nueva rama] saas-5 -> upstream/saas-5
* [nueva rama] saas-6 -> upstream/saas-6
* [nueva rama] saas-7 -> upstream/saas-7
* [nueva rama] saas-8 -> upstream/saas-8
* [nueva rama] saas-9 -> upstream/saas-9
* [nueva rama] staging.10.0 -> upstream/staging.10.0
* [nueva rama] staging.11.0 -> upstream/staging.11.0
* [nueva rama] staging.12.0 -> upstream/staging.12.0
* [nueva rama] staging.13.0 -> upstream/staging.13.0
* [nueva rama] staging.master -> upstream/staging.master
* [nueva rama] staging.saas-11.3 -> upstream/staging.saas-11.3
* [nueva rama] staging.saas-12.1 -> upstream/staging.saas-12.1
* [nueva rama] staging.saas-12.2 -> upstream/staging.saas-12.2
* [nueva rama] staging.saas-12.3 -> upstream/staging.saas-12.3
* [nueva rama] staging.saas-12.4 -> upstream/staging.saas-12.4
* [nueva rama] staging.saas-12.5 -> upstream/staging.saas-12.5
* [nueva rama] staging.saas-13.1 -> upstream/staging.saas-13.1
* [nueva rama] staging.saas-13.2 -> upstream/staging.saas-13.2
* [nueva rama] staging.saas-13.3 -> upstream/staging.saas-13.3
* [nueva rama] tmp.10.0 -> upstream/tmp.10.0
* [nueva rama] tmp.11.0 -> upstream/tmp.11.0
* [nueva rama] tmp.12.0 -> upstream/tmp.12.0
* [nueva rama] tmp.13.0 -> upstream/tmp.13.0
* [nueva rama] tmp.master -> upstream/tmp.master
* [nueva rama] tmp.saas-11.3 -> upstream/tmp.saas-11.3
* [nueva rama] tmp.saas-12.1 -> upstream/tmp.saas-12.1
* [nueva rama] tmp.saas-12.2 -> upstream/tmp.saas-12.2
* [nueva rama] tmp.saas-12.3 -> upstream/tmp.saas-12.3
* [nueva rama] tmp.saas-12.4 -> upstream/tmp.saas-12.4
* [nueva rama] tmp.saas-12.5 -> upstream/tmp.saas-12.5
* [nueva rama] tmp.saas-13.1 -> upstream/tmp.saas-13.1
* [nueva rama] tmp.saas-13.2 -> upstream/tmp.saas-13.2
* [nueva rama] tmp.saas-13.3 -> upstream/tmp.saas-13.3嗯，没关系，所有这些更改都是他们在上次提交时所做的更改。
再次检查我的回购的git状态用下一个输出进行更新。
$ git status
En la rama 13.0
Tu rama está actualizada con 'origin/13.0'.去检查我在正确的分支机构。
$ git branch
* 13.0好的，我在正确的分支
现在开始了棘手的部分.
$ git rebase upstream/13.0
En primer lugar, rebobinando HEAD para después reproducir tus cambios encima de ésta...
Aplicando: Modificando la moneda oficial de Ecuador de sucre a dolar.
Aplicando: introducing Ecuadorian states两个Aplicando都是我在分叉回购中为拉请求所做的提交的名称。
现在，如果我使用git状态，我得到了下一个结果
$ git status
En la rama 13.0
Tu rama y 'origin/13.0' han divergido,
y tienen 3 y 2 commits diferentes cada una respectivamente.
(usa "git pull" para fusionar la rama remota en la tuya)
nada para hacer commit, el árbol de trabajo esta limpio我不明白分歧的信息。有这种分歧，它想告诉我什么？？这并不意味着rama 13.0和原产/13.0是同一个分支？
如果运行git日志，将显示以下结果：
git log
commit 2aabc340fce82011c864b1ca0b5040add49d6ecd (HEAD -> 13.0)
Author: Osiris Roman <osirisr1994@gmail.com>
Date: Fri May 1 14:08:45 2020 -0500
introducing Ecuadorian states
commit b1d38ab75af5203369f2b8917719623ff2db3e6c
Author: Osiris Roman <osirisr1994@gmail.com>
Date: Thu Apr 30 23:47:39 2020 -0500
Modificando la moneda oficial de Ecuador de sucre a dolar.
La moneda oficial del Ecuador cambió de sucre a dolar en el año 2000.
commit a164b01c1dd9d8612f89b36ad11002d67fca536f (upstream/13.0)
Author: Odoo Translation Bot <c3p@odoo.com>
Date: Sun May 3 01:19:46 2020 +0200
[I18N] Update translation terms from Transifex
commit cc47c76ee70ea684ab8352c47d1d06e7d8282b1b (upstream/tmp.13.0)
Author: std-odoo <std@odoo.com>
Date: Wed Apr 22 09:15:44 2020 +0000
[FIX] mass_mailing: escape the mailing list name
Task-2241443
closes odoo/odoo#50488
X-original-commit: afa2153a24d495b863cd85febca3f96551d8cd56
Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
.
.
.
.
.前两次提交是来自于github.中我的分叉回购请求的请求。
第三个是我从原始回购中获取的，我想上传到我的分叉提交
据我所知，Git建议我把git拉起来，加入我的本地回购系统。
但是如果我让git拉，那么当我运行git状态时，就会出现四个未按下的提交，我不知道为什么和从哪里来的？
有人知道如何解决这个问题吗？？
回答 1
Stack Overflow用户
发布于 2020-05-04 04:42:11
我解决了问题
git push origin 13.0 --forcerebase命令更改存储库的历史记录。提交将更改散列并丢失祖先节点。然后，有必要用当前的服务器历史来替换服务器历史。
只有当有一个以上的人有相同的分支结账时，推力才是危险的。除了这个，应该没问题。
页面原文内容由Stack Overflow提供。腾讯云小微IT领域专用引擎提供翻译支持
原文链接：
https://stackoverflow.com/questions/61584615
复制相关文章
相似问题
腾讯云开发者
