Git：your branch is up-to-date

最新推荐文章于 2023-02-28 14:45:20 发布

楚逸山

最新推荐文章于 2023-02-28 14:45:20 发布

阅读量1.2w

点赞数

分类专栏： GitHub 文章标签： branch git

本文链接：https://blog.csdn.net/A36567/article/details/78108305

版权

GitHub 专栏收录该内容

4 篇文章 0 订阅

订阅专栏

引言

your branch is up-to-date
通常它是在git add < files… >之后出现的，其根本原因是版本分支的问题。参考文章：http://blog.csdn.net/codetomylaw/article/details/51931635

解决办法

Alex@AlexPC MINGW64 /h/StudySpace/github/MyTetris (master)
$ git status
On branch master
Your branch is up-to-date with 'origin/master'.
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

        modified:   src/com/chuyishan/teris/constant/Global.java
        modified:   src/com/chuyishan/teris/controller/Controller.java
        modified:   src/com/chuyishan/teris/entities/Ground.java
        modified:   src/com/chuyishan/teris/entities/Shape.java
        modified:   src/com/chuyishan/teris/entities/ShapeFactory.java
        modified:   src/com/chuyishan/teris/listener/ShapeListener.java
        modified:   src/com/chuyishan/teris/test/Game.java
        modified:   src/com/chuyishan/teris/view/GamePanel.java

Alex@AlexPC MINGW64 /h/StudySpace/github/MyTetris (master)
$ git fetch

Alex@AlexPC MINGW64 /h/StudySpace/github/MyTetris (master)
$ git status
On branch master
Your branch is up-to-date with 'origin/master'.
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

        modified:   src/com/chuyishan/teris/constant/Global.java
        modified:   src/com/chuyishan/teris/controller/Controller.java
        modified:   src/com/chuyishan/teris/entities/Ground.java
        modified:   src/com/chuyishan/teris/entities/Shape.java
        modified:   src/com/chuyishan/teris/entities/ShapeFactory.java
        modified:   src/com/chuyishan/teris/listener/ShapeListener.java
        modified:   src/com/chuyishan/teris/test/Game.java
        modified:   src/com/chuyishan/teris/view/GamePanel.java

Alex@AlexPC MINGW64 /h/StudySpace/github/MyTetris (master)
$ git commit -a
[master 550821b] 解决your branch is up-to-date 问题
 8 files changed, 223 insertions(+), 66 deletions(-)

Alex@AlexPC MINGW64 /h/StudySpace/github/MyTetris (master)
$ git status
On branch master
Your branch is ahead of 'origin/master' by 1 commit.
  (use "git push" to publish your local commits)
nothing to commit, working tree clean
Alex@AlexPC MINGW64 /h/StudySpace/github/MyTetris (master)

$ git push
Counting objects: 20, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (12/12), done.
Writing objects: 100% (20/20), 3.64 KiB | 0 bytes/s, done.
Total 20 (delta 8), reused 0 (delta 0)
remote: Resolving deltas: 100% (8/8), completed with 8 local objects.
To https://github.com/chuyishan/MyTetris.git
   12c6702..550821b  master -> master

Alex@AlexPC MINGW64 /h/StudySpace/github/MyTetris (master)
$ git status
On branch master
Your branch is up-to-date with 'origin/master'.
nothing to commit, working tree clean