Git 遠程跟蹤分支和上游分支不同

Question

我不確定這是怎么發生的，但是如果您查看這些輸出，就會發現表情跟蹤分支和上游分支是不同的。 有人可以解釋這怎么會發生。 我知道我的推動是有效的。 當我拉動時會發生什么？

PS C:\DigitalOffers\RegPrice> git branch
* dev
  master

PS C:\DigitalOffers\RegPrice> git branch -vv
* dev    b62f88b [origin/master: ahead 52] Price Zone resolution change.
  master 78d5fb6 [origin/master: behind 37] Merge branch 'master' of https://github.com/xxxxxxxxx

PS C:\DigitalOffers\RegPrice> git log
commit b62f88b137fa067f7d0f75ec35fb8b63fc885f50 (HEAD -> dev, origin/dev)

PS C:\DigitalOffers\RegPrice> cat .git/config
[core]
    symlinks = false
    repositoryformatversion = 0
    filemode = false
    logallrefupdates = true
[remote "origin"]
    url = https://github.com/XXXXXX
    fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
    remote = origin
    merge = refs/heads/master
    rebase = false
[branch "dev"]
    remote = origin
    merge = refs/heads/master
    rebase = false
[branch "origin/dev"]
    remote = origin
    merge = refs/heads/master
    rebase = false
[http "https://github.com"]
    sslVerify = false
[gui]
    wmstate = zoomed
    geometry = 584x210+234+234 469 196

PS C:\DigitalOffers\RegPrice> git push
fatal: The upstream branch of your current branch does not match
the name of your current branch.  To push to the upstream branch
on the remote, use

    git push origin HEAD:master

To push to the branch of the same name on the remote, use

    git push origin HEAD

To choose either option permanently, see push.default in 'git help config'.

我要補充的一點是 - 這些參考是由 EGit 在 eclipse 中完成的。

Answer 1

上游具有不同名稱的分支已損壞。 這就是你所處的情況； 您的dev分支將 origin 的master作為其上游。 要修復它，請重新指向dev分支的上游，以使其成為 origin 的dev 。

這種情況並沒有破壞您推送能力的原因是 Eclipse 正在明確指示要做什么，即要推送到哪個分支。 它一直在拯救你。 但是最好通過正確配置分支來拯救自己。

Answer 2

修正了配置。 這里是新配置和新推送

PS C:\DigitalOffers\RegPrice> git branch -vv
* dev    946f432 [origin/dev: ahead 1] Added app description in readme.md
master 78d5fb6 [origin/master: behind 37] Merge branch 'master' of 
https://github.com/XXXXXX

PS C:\DigitalOffers\RegPrice> cat .git/config
[core]
    symlinks = false
    repositoryformatversion = 0
    filemode = false
    logallrefupdates = true
[remote "origin"]
    url = https://github.com/XXXXXXX
    fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
    remote = origin
    merge = refs/heads/master
    rebase = false
[branch "dev"]
    remote = origin
    merge = refs/heads/dev
    rebase = false
[branch "origin/dev"]
    remote = origin
    merge = refs/heads/dev
    rebase = false
[http "https://github.com"]
    sslVerify = false
[gui]
    wmstate = zoomed
    geometry = 584x210+234+234 469 196

PS C:\DigitalOffers\RegPrice> git push
Username for 'https://github.com': 
Password for 'https://@github.com':
Enumerating objects: 5, done.
Counting objects: 100% (5/5), done.
Delta compression using up to 4 threads
Compressing objects: 100% (3/3), done.
Writing objects: 100% (3/3), 349 bytes | 43.00 KiB/s, done.
Total 3 (delta 1), reused 0 (delta 0)
remote: Resolving deltas: 100% (1/1), completed with 1 local object.
To https://github.com/XXXXX
    b62f88b..946f432  dev -> dev