2017-05-26 35 views
0

我不知道我是否正確地做事,顯然我不是。搞砸了我的rebase?樹不再是平坦的

我是新來rebasing。我在Git上並不是一個真正的大師級忍者大師......一直在做這件事,但那是通過合併提交的,現在試圖堅持我更喜歡前進的重新設計。

我的問題:我似乎無法再次重新綁定,我不斷收到您在下面看到的錯誤。 updates were rejected。這個消息並沒有真正解釋發生了什麼事情,或者即使它可能對一些git gurus :)如何解決它。

我認爲發生了什麼事是我推動代碼一次,沒有重新綁定第一,最後與一個分離的頭,並最終做了合併,而不是rebase。正如你可以看到我的樹不再是一條直線:

You like that nice UI? That's WebSto rm baby!我通過命令行做我的大部分工作,但是當我想看看這棵樹,這是更好的在看。

enter image description here

下面是我的步驟,這讓我陷入這種困境: ``` 分支/主頁XXXX-登錄✔

GA。

branches/homepage xxxx-log-in ✗ 

gcmsg 「中的package.json刪除代理項,試圖解決API調用」

[xxxx-log-in 0fb184d] removed proxy entry in package.json, 
was trying to troubleshoot API call 
    1 file changed, 6 deletions(-) 

branches/homepage xxxx-log-in ✔                                                                0m 

GA。

branches/homepage xxxx-log-in ✔ 

git的變基-i發展

[detached HEAD bb5fdb3] problem with call to API - getting 403 
Date: Fri May 26 11:04:35 2017 -0500 
22 files changed, 185 insertions(+), 91 deletions(-) 
create mode 100644 src/client/reducers/AuthReducer.js 
create mode 100644 src/test/integration/api.integration.spec.js 
rename src/test/{unit => }/testImports.js (76%) 
Successfully rebased and updated refs/heads/xxxx-log-in. 

分支/主頁XXXX-登錄✔

混帳推起源XXXX-登錄

To https://github.com/xxxx 
! [rejected]  xxxx-log-in -> xxxx-log-in (non-fast-forward) 
error: failed to push some refs to 'https://github.com/xxxx' 
hint: Updates were rejected because the tip of your current branch is behind 
hint: its remote counterpart. Integrate the remote changes (e.g. 
hint: 'git pull ...') before pushing again. 
hint: See the 'Note about fast-forwards' in 'git push --help' for details. 

branches/homepage xxxx-log-in ✔ 

混帳拉

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> xxxx-log-in 

branches/homepage xxxx-log-in ✔ 

的git拉出身XXXX-LOG-我ň

fatal: Couldn't find remote ref xxxx-log-in 

branches/homepage xxxx-log-in ✔ 

混帳推

fatal: The current branch xxxx-log-in has no upstream branch. 
To push the current branch and set the remote as upstream, use 

    git push --set-upstream origin xxxx-log-in 

branches/homepage xxxx-log-in ✔ 

混帳推 - -set-upstream origin xxxx-log-in

To https://github.com/xxxx 
! [rejected] xxxx-log-in -> xxxx-log-in (non-fast-forward) 
error: failed to push some refs to 'https://github.com/xxxx' 
hint: Updates were rejected because the tip of your current branch is behind 
hint: its remote counterpart. Integrate the remote changes (e.g. 
hint: 'git pull ...') before pushing again. 
hint: See the 'Note about fast-forwards' in 'git push --help' for details. 

branches/homepage xxxx-log-in ✔ 

git的狀態

On branch xxxx-log-in 
nothing to commit, working tree clean 

branches/homepage w1-user-can-log-in ✔ 

混帳拉--ff只

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> xxxx-log-in 

branches/homepage xxxx-log-in ✔ 

的git拉出身XXXX-登錄

From https://github.com/xxxx 
* branch   xxxx-log-in -> FETCH_HEAD 
Auto-merging package.json 
Merge made by the 'recursive' strategy. 
package.json | 6 ++++++ 
1 file changed, 6 insertions(+) 

branches/homepage xxxx-log-in ✔ 

ga。

branches/homepage xxxx-log-in ✗ 

▶克**在包CMSG「移除代理條目。JSON,試圖

troubleshoot API call"** 
[xxxx-log-in db91b96] removed proxy entry in package.json, was trying to troubleshoot API call 
1 file changed, 6 deletions(-) 

branches/homepage xxxx-log-in ✔ 

git的變基-i發展

[*detached* HEAD 47a599c] added integration test script to package.json 
Date: Fri May 26 11:15:25 2017 -0500 
2 files changed, 37 deletions(-) 
delete mode 100644 src/test/integration/api-integration-spec.js 
Successfully rebased and updated refs/heads/xxxx-log-in. 

branches/homepage xxxx-log-in ✔ 

混帳推起源XXXX-登錄

To https://github.com/xxxx 
! [rejected]  xxxx-log-in -> xxxx-log-in (non-fast-forward) 
error: failed to push some refs to 'https://github.com/xxxx' 
hint: Updates were rejected because the tip of your current branch is behind 
hint: its remote counterpart. Integrate the remote changes (e.g. 
hint: 'git pull ...') before pushing again. 
hint: See the 'Note about fast-forwards' in 'git push --help' for details. 

branches/homepage xxxx-log-in ✔ 

git的結帳XXXX -log-in

Already on 'xxxx-log-in' 

branches/homepage xxxx-log-in ✔ 

GIT中拉原點XXXX-登錄在

From https://github.com/xxxx 
* branch   xxxx-log-in -> FETCH_HEAD 
Auto-merging package.json 
Merge made by the 'recursive' strategy. 
package.json | 6 ++++++ 
1 file changed, 6 insertions(+) 

branches/homepage xxxx-log-in ✔ 

GIT中推

fatal: The current branch xxxx-log-in has no upstream branch. 
To push the current branch and set the remote as upstream, use 

    git push --set-upstream origin xxxx-log-in 

branches/homepage xxxx-log-in ✔ 

GIT中推--set上游原點XXXX-對數在

Counting objects: 10, done. 
Delta compression using up to 8 threads. 
Compressing objects: 100% (10/10), done. 
Writing objects: 100% (10/10), 1.26 KiB | 0 bytes/s, done. 
Total 10 (delta 5), reused 0 (delta 0) 
remote: Resolving deltas: 100% (5/5), completed with 4 local objects. 
To https://github.com/xxxx 
    55aaad5..59507fb xxxx-log-in -> xxxx-log-in 
Branch w1-user-can-log-in set up to track remote branch xxxx-log-in from origin.  
branches/homepage xxxx-log-in ✔ 

ga。

branches/homepage xxxx-log-in ✗ 

gcmsg 「從刪除的package.json代理」

[xxxx-log-in 8f7363f] removed proxy from package.json 
1 file changed, 1 insertion(+), 6 deletions(-) 

branches/homepage xxxx-log-in ✔ 

git的變基-i發展

Successfully rebased and updated refs/heads/xxxx-log-in. 

branches/homepage xxxx-log-in ✔ 

混帳推起源XXXX-日誌-in

To https://github.com/xxxx 
! [rejected]  xxxx-log-in -> xxxx-log-in (fetch first) 
***error: failed to push some refs to 'https://github.com/xxxx'*** 
hint: Updates were rejected because the remote contains work that you do 
hint: not have locally. This is usually caused by another repository pushing 
hint: to the same ref. You may want to first integrate the remote changes 
hint: (e.g., 'git pull ...') before pushing again. 
hint: See the 'Note about fast-forwards' in 'git push --help' for details. 

branches/homepage xxxx-log-in ✔ 

的git拉出身XXXX-登錄

remote: Counting objects: 7, done. 
remote: Compressing objects: 100% (3/3), done. 
remote: Total 7 (delta 4), reused 7 (delta 4), pack-reused 0 
Unpacking objects: 100% (7/7), done. 
From https://github.com/xxxx 
* branch   xxxx-log-in -> FETCH_HEAD 
    59507fb..4b13f34 xxxx-log-in -> origin/xxxx-log-in 
Auto-merging package.json 
Merge made by the 'recursive' strategy. 
package.json         | 6 ++++++ 
src/test/integration/api.integration.spec.js | 9 ++++----- 
2 files changed, 10 insertions(+), 5 deletions(-) 

branches/homepage xxxx-log-in ✔ 

GA。

branches/homepage xxxx-log-in ✗ 

gcmsg 「刪除會話的所有實例 - 不需要」

[xxxx-log-in d37a719] removed all instances of session - not needed 
5 files changed, 8 insertions(+), 13 deletions(-) 

branches/homepage xxxx-log-in ✔ 

git的變基-i發展

Successfully rebased and updated refs/heads/xxxx-log-in. 

xxx/branches/homepage xxxx-log-in ✔ 

混帳推起源XXXX -log-in

To https://github.com/xxxx 
! [rejected]  xxxx-log-in -> xxxx-log-in (non-fast-forward) 
error: failed to push some refs to 'https://github.com/xxxx/xxx' 
hint: Updates were rejected because the tip of your current branch is behind 
hint: its remote counterpart. Integrate the remote changes (e.g. 
hint: 'git pull ...') before pushing again. 
hint: See the 'Note about fast-forwards' in 'git push --help' for details. 
+0

[Git提交可能重複在重做後在同一分支中重複](https://stackoverflow.com/questions/9264314/git-commits-are-duplicated-in-the-same-branch-after -doing-a-rebase) – Whymarrh

+2

您可能希望將會話粘貼爲帶格式的文本,而不是模糊的屏幕截圖。你也沒有解釋確切的問題是什麼,你是否僅僅在美學上反對出現在你的歷史中的一個分支? – pvg

+0

問題是我得到了我的rebase – PositiveGuy

回答

0

如果我假定提交消息是唯一的,那麼您有2個提交。

爲了解決您的問題,您需要:

git reset HEAD^2 # fix local history git push -fu origin xxxx-log-in # force push and set upstream on remote

這是假設你仍然在從截圖的地方。

+0

thx。當我嘗試重置時,我得到了:atal:模棱兩可的參數'HEAD^2':未知版本或路徑不在工作樹中。你可能意思是HEAD〜2? – PositiveGuy