Question

我不确定如何解决这个问题：

▶ git push origin登录

Counting objects: 110, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (104/104), done.
Writing objects: 100% (110/110), 12.23 KiB | 0 bytes/s, done.
Total 110 (delta 64), reused 0 (delta 0)
remote: Resolving deltas: 100% (64/64), completed with 25 local objects.
To https://github.com/xxxx
   4b13f34..b010a31  log-in -> log-in                                                                                                                                                                                                       1d § ✚  

branches/homepage  df9db35 ✗                                                                                                                                                                                                                            1d § ✚

▶ git checkout登录

src/client/Api/UserApi.js: needs merge
src/client/actions/User/UserAsyncActions.js: needs merge
src/client/containers/LoginContainer.js: needs merge
src/client/reducers/UserReducer.js: needs merge
src/test/testImports.js: needs merge
src/test/unit/actions/user.async.action.spec.js: needs merge
src/test/unit/app.spec.js: needs merge
src/test/unit/usecases/authentication.feature.js: needs merge
error: you need to resolve your current index first

我只是想回到正轨。我想摆脱树中的这种平行变化，并在头顶上保持随意的变化。

因为当我开始时，我有一个很好的rebase，所有一行：

▶git status

interactive rebase in progress; onto bbea7dc
Last commands done (54 commands done):
   s a07cc17 added <Provider /> back into new reac-router v4 implementation to pesist store
   s 51fcda4 problem with call to API - getting 403
  (see more in file .git/rebase-merge/done)
Next commands to do (2 remaining commands):
   s 55aaad5 added integration test script to package.json
   s d809245 fixed login test
  (use "git rebase --edit-todo" to view and edit)
You are currently rebasing branch 'log-in' on 'bbea7dc'.
  (fix conflicts and then run "git rebase --continue")
  (use "git rebase --skip" to skip this patch)
  (use "git rebase --abort" to check out the original branch)

Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

        modified:   package.json
        new file:   src/test/integration/api-integration-spec.js

Unmerged paths:
  (use "git reset HEAD <file>..." to unstage)
  (use "git add <file>..." to mark resolution)

        both modified:   src/client/Api/UserApi.js
        both modified:   src/client/actions/User/UserAsyncActions.js
        both modified:   src/client/containers/LoginContainer.js
        both modified:   src/client/reducers/UserReducer.js
        added by them:   src/test/testImports.js
        both modified:   src/test/unit/actions/user.async.action.spec.js
        both modified:   src/test/unit/app.spec.js
        both modified:   src/test/unit/usecases/authentication.feature.js

You are currently rebasing branch 'log-in' on 'bbea7dc'.

我只想再次登录我的主分支，这是登录（不是基于特定的提交，而是指向头部

如何指向头部，这样我就可以干净利落地重新定位

0 个答案: