git出错"Your branch is ahead of 'origin/LS3A_2H' by 4 commits"解决

来源：互联网发布：淘宝店如何打造爆款编辑：程序博客网时间：2024/05/22 00:11

当运行命令

git status

后，出现这种log信息，之后修改程序push时会出错，所以在出现这种信息时就需要进行sync修改。

$ git statusOn branch LS3A_2HYour branch is ahead of 'origin/LS3A_2H' by 4 commits.  (use "git push" to publish your local commits)nothing to commit, working directory clean

解决方法：

$ git fetch originFrom ssh://10.2.5.33:29418/WindRiver   60f0a02..eb02e64  LS3A_2H    -> origin/LS3A_2H

验证：

$ git statusOn branch LS3A_2HYour branch is up-to-date with 'origin/LS3A_2H'.nothing to commit, working directory clean

解决方式2：

baz@bhost:/more/coding/git-tests$ git clone https://shishani@bitbucket.org/shishani/dirasi.git ask1Cloning into ask1...Password: remote: Counting objects: 24054, done.remote: Compressing objects: 100% (6300/6300), done.remote: Total 24054 (delta 17124), reused 24024 (delta 17106)Receiving objects: 100% (24054/24054), 11.83 MiB | 251 KiB/s, done.Resolving deltas: 100% (17124/17124), done.baz@bhost:/more/coding/git-tests$ cd ask1baz@bhost:/more/coding/git-tests/ask1$ jed setup.pybaz@bhost:/more/coding/git-tests/ask1$ git commit -a[master a053f28]    modified:   setup.py 1 files changed, 1 insertions(+), 0 deletions(-)baz@bhost:/more/coding/git-tests/ask1$ git status# On branch master# Your branch is ahead of 'origin/master' by 1 commit.#nothing to commit (working directory clean)baz@bhost:/more/coding/git-tests/ask1$ git remote show originPassword: * remote origin  Fetch URL: https://shishani@bitbucket.org/shishani/dirasi.git  Push  URL: https://shishani@bitbucket.org/shishani/dirasi.git  HEAD branch: master  Remote branch:    master tracked  Local branch configured for 'git pull':    master merges with remote master  Local ref configured for 'git push':    master pushes to master (fast-forwardable)baz@bhost:/more/coding/git-tests/ask1$ git pushPassword: Counting objects: 5, done.Delta compression using up to 2 threads.Compressing objects: 100% (3/3), done.Writing objects: 100% (3/3), 314 bytes, done.Total 3 (delta 2), reused 0 (delta 0)remote: bb/acl: shishani is allowed. accepted payload.To https://shishani@bitbucket.org/shishani/dirasi.git   5e9ffd1..a053f28  master -> masterbaz@bhost:/more/coding/git-tests/ask1$ git status# On branch masternothing to commit (working directory clean)baz@bhost:/more/coding/git-tests/ask1$ jed setup.pybaz@bhost:/more/coding/git-tests/ask1$ git commit -a[master 6d0e236]    modified:   setup.py 1 files changed, 1 insertions(+), 0 deletions(-)baz@bhost:/more/coding/git-tests/ask1$ git push https://shishani@bitbucket.org/shishani/dirasi.git masterPassword: Counting objects: 5, done.Delta compression using up to 2 threads.Compressing objects: 100% (3/3), done.Writing objects: 100% (3/3), 298 bytes, done.Total 3 (delta 2), reused 0 (delta 0)remote: bb/acl: shishani is allowed. accepted payload.To https://shishani@bitbucket.org/shishani/dirasi.git   a053f28..6d0e236  master -> masterbaz@bhost:/more/coding/git-tests/ask1$ git status# On branch master**# Your branch is ahead of 'origin/master' by 1 commit.** <-- this does not reflect current state#nothing to commit (working directory clean)baz@bhost:/more/coding/git-tests/ask1$ git pushPassword: Everything up-to-datebaz@bhost:/more/coding/git-tests/ask1$ git status# On branch masternothing to commit (working directory clean)

解决方式3：

wh-test $ git branch -aalternate* cherryPick  master  new  squashBranch  testBranch  remotes/origin/HEAD -> origin/master  remotes/origin/cherryPick  remotes/origin/master  remotes/origin/testBranchwh-test $ git status# On branch cherryPick# Your branch is ahead of 'origin/cherryPick' by 1 commit.#wh-test $ git pull origin cherryPickFrom ssh://xxxx.dyndns.org/home/shopapp/wh-test * branch            cherryPick -> FETCH_HEADAlready up-to-date.

阅读全文

0 0