代码之家  ›  专栏  ›  技术社区  ›  mj1261829

无法将提交推送到GitHub上新创建的存储库

  •  -1
  • mj1261829  · 技术社区  · 6 年前

    git add --all 要在文件夹中添加所有内容,并使用当前目录作为主目录,我仍然在推送时遇到问题。

    fetch , pull merge rebase ,那么 push 但它又不起作用。以下是我所做的部分工作:

    Muaz Aljarhi@MuazAljarhi-PC MINGW64 /f/muaz/Programming/Java (master)
    $ git push -u origin master
    fatal: HttpRequestException encountered.
       An error occurred while sending the request.
    Username for 'https://github.com': Muaz.Al.Jarhi@Gmail.com
    To https://github.com/SamuraiHub/Java.git
     ! [rejected]        master -> master (fetch first)
    error: failed to push some refs to 'https://github.com/SamuraiHub/Java.git'
    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.
    
    Muaz Aljarhi@MuazAljarhi-PC MINGW64 /f/muaz/Programming/Java (master)
    $ ^C
    
    Muaz Aljarhi@MuazAljarhi-PC MINGW64 /f/muaz/Programming/Java (master)
    $ git fetch origin master
    warning: no common commits
    remote: Counting objects: 3, done.
    remote: Total 3 (delta 0), reused 0 (delta 0), pack-reused 0
    Unpacking objects: 100% (3/3), done.
    From https://github.com/SamuraiHub/Java
     * branch            master     -> FETCH_HEAD
     * [new branch]      master     -> origin/master
    Auto packing the repository in background for optimum performance.
    See "git help gc" for manual housekeeping.
    Counting objects: 6350, done.
    Delta compression using up to 8 threads.
    Compressing objects: 100% (6164/6164), done.
    Writing objects: 100% (6350/6350), done.
    Total 6350 (delta 534), reused 0 (delta 0)
    Removing duplicate objects: 100% (256/256), done.
    
    Muaz Aljarhi@MuazAljarhi-PC MINGW64 /f/muaz/Programming/Java (master)
    $ git merge origin master
    merge: origin - not something we can merge
    
    Muaz Aljarhi@MuazAljarhi-PC MINGW64 /f/muaz/Programming/Java (master)
    $ git push -u origin master
    fatal: HttpRequestException encountered.
       An error occurred while sending the request.
    Username for 'https://github.com': Muaz.Al.Jarhi@Gmail.com
    To https://github.com/SamuraiHub/Java.git
     ! [rejected]        master -> master (non-fast-forward)
    error: failed to push some refs to 'https://github.com/SamuraiHub/Java.git'
    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.
    
    Muaz Aljarhi@MuazAljarhi-PC MINGW64 /f/muaz/Programming/Java (master)
    $ git pull
    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> master
    
    
    Muaz Aljarhi@MuazAljarhi-PC MINGW64 /f/muaz/Programming/Java (master)
    $ git checkout master
    Already on 'master'
    
    Muaz Aljarhi@MuazAljarhi-PC MINGW64 /f/muaz/Programming/Java (master)
    $ git pull
    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> master
    
    
    Muaz Aljarhi@MuazAljarhi-PC MINGW64 /f/muaz/Programming/Java (master)
    $ git push -u origin master
    fatal: HttpRequestException encountered.
       An error occurred while sending the request.
    Username for 'https://github.com': Muaz.Al.Jarhi@Gmail.com
    To https://github.com/SamuraiHub/Java.git
     ! [rejected]        master -> master (non-fast-forward)
    error: failed to push some refs to 'https://github.com/SamuraiHub/Java.git'
    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.
    
    Muaz Aljarhi@MuazAljarhi-PC MINGW64 /f/muaz/Programming/Java (master)
    $ git pull --rebase
    There is no tracking information for the current branch.
    Please specify which branch you want to rebase against.
    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> master
    
    
    Muaz Aljarhi@MuazAljarhi-PC MINGW64 /f/muaz/Programming/Java (master)
    $ git fetch origin master
    From https://github.com/SamuraiHub/Java
     * branch            master     -> FETCH_HEAD
    
    Muaz Aljarhi@MuazAljarhi-PC MINGW64 /f/muaz/Programming/Java (master)
    $ git merge origin master
    merge: origin - not something we can merge
    
    Muaz Aljarhi@MuazAljarhi-PC MINGW64 /f/muaz/Programming/Java (master)
    $ git merge master
    Already up-to-date.
    
    Muaz Aljarhi@MuazAljarhi-PC MINGW64 /f/muaz/Programming/Java (master)
    $ git push -u origin master
    fatal: HttpRequestException encountered.
       An error occurred while sending the request.
    Username for 'https://github.com': Muaz.Al.Jarhi@Gmail.com
    To https://github.com/SamuraiHub/Java.git
     ! [rejected]        master -> master (non-fast-forward)
    error: failed to push some refs to 'https://github.com/SamuraiHub/Java.git'
    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.
    
    Muaz Aljarhi@MuazAljarhi-PC MINGW64 /f/muaz/Programming/Java (master)
    $ ^C
    
    Muaz Aljarhi@MuazAljarhi-PC MINGW64 /f/muaz/Programming/Java (master)
    $ git pull --rebase
    There is no tracking information for the current branch.
    Please specify which branch you want to rebase against.
    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> master
    
    
    Muaz Aljarhi@MuazAljarhi-PC MINGW64 /f/muaz/Programming/Java (master)
    $ git pull
    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> master
    
    
    Muaz Aljarhi@MuazAljarhi-PC MINGW64 /f/muaz/Programming/Java (master)
    $ git pull origin master --rebase
    From https://github.com/SamuraiHub/Java
     * branch            master     -> FETCH_HEAD
    First, rewinding head to replay your work on top of it...
    
    
    
    Muaz Aljarhi@MuazAljarhi-PC MINGW64 /f/muaz/Programming/Java ((ec222e4...)|AM/REBASE)
    $
    
    Muaz Aljarhi@MuazAljarhi-PC MINGW64 /f/muaz/Programming/Java ((ec222e4...)|AM/REBASE)
    $ git push -u origin master
    fatal: HttpRequestException encountered.
       An error occurred while sending the request.
    Username for 'https://github.com': Muaz.Al.Jarhi@Gmail.com
    To https://github.com/SamuraiHub/Java.git
     ! [rejected]        master -> master (non-fast-forward)
    error: failed to push some refs to 'https://github.com/SamuraiHub/Java.git'
    hint: Updates were rejected because a pushed branch tip is behind its remote
    hint: counterpart. Check out this branch and 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.
    
    Muaz Aljarhi@MuazAljarhi-PC MINGW64 /f/muaz/Programming/Java ((ec222e4...)|AM/REBASE)
    $ git checkout master
    Checking out files: 100% (10551/10551), done.
    Previous HEAD position was ec222e4... Initial commit
    Switched to branch 'master'
    
    Muaz Aljarhi@MuazAljarhi-PC MINGW64 /f/muaz/Programming/Java (master|AM/REBASE)
    $ git push -u origin master
    fatal: HttpRequestException encountered.
       An error occurred while sending the request.
    Username for 'https://github.com': Muaz.Al.Jarhi@Gmail.com
    To https://github.com/SamuraiHub/Java.git
     ! [rejected]        master -> master (non-fast-forward)
    error: failed to push some refs to 'https://github.com/SamuraiHub/Java.git'
    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.
    
    Muaz Aljarhi@MuazAljarhi-PC MINGW64 /f/muaz/Programming/Java (master|AM/REBASE)
    $
    

    除了从网站上传和使用 --force -f 选项(我知道它可能不会在这里引起问题,但通常我们不应该使用它)?

    1 回复  |  直到 6 年前
        1
  •  4
  •   Chris    6 年前

    在线存储库只包含一个初始提交和一个自述文件

    我可能会通过添加远程抓取 origin/master , 重新定位 (不合并)我的本地工作在上面,然后推动:

    git remote add origin <url>
    git fetch origin
    git checkout master
    git rebase origin/master
    git push
    

    $ git merge origin master
    merge: origin - not something we can merge
    

    你需要合并 (命名远程跟踪引用的单个参数),而不是 origin master

    git pull master :

    $ git pull
    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> master
    

    Git不知道要获取哪个远程分支并将其合并到本地 ,但你可以用英语说出来 git branch --set-upstream-to ,如错误消息所示。

    除了从网站上传和使用 --force -f 选项(我知道它可能不会在这里引起问题,但通常我们不应该使用它)?

    在本例中,如果您不想要GitHub创建的自述文件,我认为强制推送没有任何坏处(尽管我建议先获取并使用 --force-with-lease ,这不太可能让您重击(您不知道的)。