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'.

我想补充的一点是-这些引用是由Eclipse中的EGit完成的。

Answer 1

其上游名称不同的分支已损坏。那就是你所处的状况；您的dev分支将源master作为上游。要解决此问题，请重新指向dev分支的上游，使其改为原点的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

Git远程跟踪分支和上游分支不同

2 个答案: