今天本地撸代码弄到一半想push一下...失败了
看了下分支名称突然变空了,不对啊,我本地的分支是master啊!
dell@DESKTOP-0II6H5B MINGW64 /d/dev-project/IdeaProjects/Web-Server2208 ((652e568...))
$ git branch
* (HEAD detached from 1d85459)
master
重构了这么一大堆咋办啊?这时我想了下能否把本地的这个无名分支能和本地master合并
找了一篇文档
一通瞎B的蜜汁操作之后...
dell@DESKTOP-0II6H5B MINGW64 /d/dev-project/IdeaProjects/Web-Server2208 ((652e568...))
$ git status
HEAD detached from 1d85459
Changes to be committed:
(use "git restore --staged <file>..." to unstage)
new file: V5/pom.xml
new file: V5/src/main/java/com/webserver/core/ClientHandler.java
new file: V5/src/main/java/com/webserver/core/WebServerApplication.java
new file: V5/src/main/java/com/webserver/http/HttpServletRequest.java
new file: V6/pom.xml
new file: V6/src/main/java/com/webserver/core/ClientHandler.java
new file: V6/src/main/java/com/webserver/core/WebServerApplication.java
new file: V6/src/main/java/com/webserver/http/HttpServletRequest.java
new file: V6/src/main/resources/static/index.html
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: README.md
modified: V5/src/main/java/com/webserver/core/ClientHandler.java
modified: V5/src/main/java/com/webserver/http/HttpServletRequest.java
modified: V6/src/main/resources/static/index.html
modified: pom.xml
Untracked files:
(use "git add <file>..." to include in what will be committed)
.idea/
V1/target/
V2/target/
V3/target/
V4/target/
V5/target/
dell@DESKTOP-0II6H5B MINGW64 /d/dev-project/IdeaProjects/Web-Server2208 ((652e568...))
$ git add .
dell@DESKTOP-0II6H5B MINGW64 /d/dev-project/IdeaProjects/Web-Server2208 ((652e568...))
$ git status
HEAD detached from 1d85459
Changes to be committed:
(use "git restore --staged <file>..." to unstage)
new file: .idea/.gitignore
new file: .idea/compiler.xml
new file: .idea/jarRepositories.xml
new file: .idea/misc.xml
new file: .idea/uiDesigner.xml
new file: .idea/vcs.xml
modified: README.md
new file: V1/target/classes/com/webserver/core/WebServerApplication.class
new file: V2/target/classes/com/webserver/core/ClientHandler.class
new file: V2/target/classes/com/webserver/core/WebServerApplication.class
new file: V3/target/classes/com/webserver/core/ClientHandler.class
new file: V3/target/classes/com/webserver/core/WebServerApplication.class
new file: V4/target/classes/com/webserver/core/ClientHandler.class
new file: V4/target/classes/com/webserver/core/WebServerApplication.class
new file: V5/pom.xml
new file: V5/src/main/java/com/webserver/core/ClientHandler.java
new file: V5/src/main/java/com/webserver/core/WebServerApplication.java
new file: V5/src/main/java/com/webserver/http/HttpServletRequest.java
new file: V5/target/classes/com/webserver/core/ClientHandler.class
new file: V5/target/classes/com/webserver/core/WebServerApplication.class
new file: V5/target/classes/com/webserver/http/HttpServletRequest.class
new file: V6/pom.xml
new file: V6/src/main/java/com/webserver/core/ClientHandler.java
new file: V6/src/main/java/com/webserver/core/WebServerApplication.java
new file: V6/src/main/java/com/webserver/http/HttpServletRequest.java
new file: V6/src/main/resources/static/index.html
modified: pom.xml
dell@DESKTOP-0II6H5B MINGW64 /d/dev-project/IdeaProjects/Web-Server2208 ((652e568...))
$ git commit -m "完成V5 代码重构"
[detached HEAD 432ff75] 完成V5 代码重构
27 files changed, 878 insertions(+)
create mode 100644 .idea/.gitignore
create mode 100644 .idea/compiler.xml
create mode 100644 .idea/jarRepositories.xml
create mode 100644 .idea/misc.xml
create mode 100644 .idea/uiDesigner.xml
create mode 100644 .idea/vcs.xml
create mode 100644 V1/target/classes/com/webserver/core/WebServerApplication.class
create mode 100644 V2/target/classes/com/webserver/core/ClientHandler.class
create mode 100644 V2/target/classes/com/webserver/core/WebServerApplication.class
create mode 100644 V3/target/classes/com/webserver/core/ClientHandler.class
create mode 100644 V3/target/classes/com/webserver/core/WebServerApplication.class
create mode 100644 V4/target/classes/com/webserver/core/ClientHandler.class
create mode 100644 V4/target/classes/com/webserver/core/WebServerApplication.class
create mode 100644 V5/pom.xml
create mode 100644 V5/src/main/java/com/webserver/core/ClientHandler.java
create mode 100644 V5/src/main/java/com/webserver/core/WebServerApplication.java
create mode 100644 V5/src/main/java/com/webserver/http/HttpServletRequest.java
create mode 100644 V5/target/classes/com/webserver/core/ClientHandler.class
create mode 100644 V5/target/classes/com/webserver/core/WebServerApplication.class
create mode 100644 V5/target/classes/com/webserver/http/HttpServletRequest.class
create mode 100644 V6/pom.xml
create mode 100644 V6/src/main/java/com/webserver/core/ClientHandler.java
create mode 100644 V6/src/main/java/com/webserver/core/WebServerApplication.java
create mode 100644 V6/src/main/java/com/webserver/http/HttpServletRequest.java
create mode 100644 V6/src/main/resources/static/index.html
dell@DESKTOP-0II6H5B MINGW64 /d/dev-project/IdeaProjects/Web-Server2208 ((432ff75...))
$ git branch
* (HEAD detached from 1d85459)
master
dell@DESKTOP-0II6H5B MINGW64 /d/dev-project/IdeaProjects/Web-Server2208 ((432ff75...))
$ git branch -m dev
fatal: Invalid branch name: 'HEAD'
dell@DESKTOP-0II6H5B MINGW64 /d/dev-project/IdeaProjects/Web-Server2208 ((432ff75...))
$ git branch
* (HEAD detached from 1d85459)
master
dell@DESKTOP-0II6H5B MINGW64 /d/dev-project/IdeaProjects/Web-Server2208 ((432ff75...))
$ git merge master
Already up to date.
dell@DESKTOP-0II6H5B MINGW64 /d/dev-project/IdeaProjects/Web-Server2208 ((432ff75...))
$ git branch
* (HEAD detached from 1d85459)
master
dell@DESKTOP-0II6H5B MINGW64 /d/dev-project/IdeaProjects/Web-Server2208 ((432ff75...))
$ git checkout master
Warning: you are leaving 2 commits behind, not connected to
any of your branches:
432ff75 完成V5 代码重构
652e568 V4完成
If you want to keep them by creating a new branch, this may be a good time
to do so with:
git branch <new-branch-name> 432ff75
Switched to branch 'master'
Your branch is up to date with 'origin/master'.
dell@DESKTOP-0II6H5B MINGW64 /d/dev-project/IdeaProjects/Web-Server2208 (master)
$ git remote show
origin
dell@DESKTOP-0II6H5B MINGW64 /d/dev-project/IdeaProjects/Web-Server2208 (master)
$ git remote -v
origin https://gitee.com/xyzbacjk/Web-Server2208.git (fetch)
origin https://gitee.com/xyzbacjk/Web-Server2208.git (push)
dell@DESKTOP-0II6H5B MINGW64 /d/dev-project/IdeaProjects/Web-Server2208 (master)
$ git push origin
git: 'credential-manager' is not a git command. See 'git --help'.
The most similar command is
credential-manager-core
Everything up-to-date
然后去git看了下...没传上去
“我草,我切了分支啊!之前的分支没事吧?之前的分支名字都没我怎么checkout回去啊?”
我重新回去看了下人家给的提示,发现了一句
dell@DESKTOP-0II6H5B MINGW64 /d/dev-project/IdeaProjects/Web-Server2208 ((432ff75...))
$ git checkout master
Warning: you are leaving 2 commits behind, not connected to
any of your branches:
432ff75 完成V5 代码重构
652e568 V4完成
If you want to keep them by creating a new branch, this may be a good time
to do so with:
git branch <new-branch-name> 432ff75
Switched to branch 'master'
Your branch is up to date with 'origin/master'.
我谢谢你git,你帮我想到了!
修改git分支名称,和master合并之后,最后push
dell@DESKTOP-0II6H5B MINGW64 /d/dev-project/IdeaProjects/Web-Server2208 (master)
$ git branch dev 432ff75
dell@DESKTOP-0II6H5B MINGW64 /d/dev-project/IdeaProjects/Web-Server2208 (master)
$ git branch
dev
* master
dell@DESKTOP-0II6H5B MINGW64 /d/dev-project/IdeaProjects/Web-Server2208 (master)
$ git merge dev
error: The following untracked working tree files would be overwritten by merge:
.idea/compiler.xml
.idea/misc.xml
Please move or remove them before you merge.
Aborting
Updating 1d85459..432ff75
dell@DESKTOP-0II6H5B MINGW64 /d/dev-project/IdeaProjects/Web-Server2208 (master)
$ git checkout dev
error: The following untracked working tree files would be overwritten by checkout:
.idea/compiler.xml
.idea/misc.xml
Please move or remove them before you switch branches.
Aborting
dell@DESKTOP-0II6H5B MINGW64 /d/dev-project/IdeaProjects/Web-Server2208 (master)
$ git checkout dev
Switched to branch 'dev'
dell@DESKTOP-0II6H5B MINGW64 /d/dev-project/IdeaProjects/Web-Server2208 (dev)
$ git checkout master
Switched to branch 'master'
Your branch is up to date with 'origin/master'.
dell@DESKTOP-0II6H5B MINGW64 /d/dev-project/IdeaProjects/Web-Server2208 (master)
$ git merge dev
Updating 1d85459..432ff75
Fast-forward
.idea/.gitignore | 3 +
.idea/compiler.xml | 18 +
.idea/jarRepositories.xml | 20 ++
.idea/misc.xml | 14 +
.idea/uiDesigner.xml | 124 +++++++
.idea/vcs.xml | 6 +
README.md | 377 +++++++++++++++++++++
.../com/webserver/core/WebServerApplication.class | Bin 0 -> 1257 bytes
.../classes/com/webserver/core/ClientHandler.class | Bin 0 -> 979 bytes
.../com/webserver/core/WebServerApplication.class | Bin 0 -> 1517 bytes
.../classes/com/webserver/core/ClientHandler.class | Bin 0 -> 1908 bytes
.../com/webserver/core/WebServerApplication.class | Bin 0 -> 1517 bytes
V4/pom.xml | 19 ++
.../java/com/webserver/core/ClientHandler.java | 101 ++++++
.../com/webserver/core/WebServerApplication.java | 54 +++
.../classes/com/webserver/core/ClientHandler.class | Bin 0 -> 3167 bytes
.../com/webserver/core/WebServerApplication.class | Bin 0 -> 1517 bytes
V5/pom.xml | 19 ++
.../java/com/webserver/core/ClientHandler.java | 35 ++
.../com/webserver/core/WebServerApplication.java | 54 +++
.../com/webserver/http/HttpServletRequest.java | 130 +++++++
.../classes/com/webserver/core/ClientHandler.class | Bin 0 -> 704 bytes
.../com/webserver/core/WebServerApplication.class | Bin 0 -> 1517 bytes
.../com/webserver/http/HttpServletRequest.class | Bin 0 -> 3731 bytes
V6/pom.xml | 19 ++
.../java/com/webserver/core/ClientHandler.java | 35 ++
.../com/webserver/core/WebServerApplication.java | 54 +++
.../com/webserver/http/HttpServletRequest.java | 130 +++++++
V6/src/main/resources/static/index.html | 10 +
pom.xml | 3 +
30 files changed, 1225 insertions(+)
create mode 100644 .idea/.gitignore
create mode 100644 .idea/compiler.xml
create mode 100644 .idea/jarRepositories.xml
create mode 100644 .idea/misc.xml
create mode 100644 .idea/uiDesigner.xml
create mode 100644 .idea/vcs.xml
create mode 100644 V1/target/classes/com/webserver/core/WebServerApplication.class
create mode 100644 V2/target/classes/com/webserver/core/ClientHandler.class
create mode 100644 V2/target/classes/com/webserver/core/WebServerApplication.class
create mode 100644 V3/target/classes/com/webserver/core/ClientHandler.class
create mode 100644 V3/target/classes/com/webserver/core/WebServerApplication.class
create mode 100644 V4/pom.xml
create mode 100644 V4/src/main/java/com/webserver/core/ClientHandler.java
create mode 100644 V4/src/main/java/com/webserver/core/WebServerApplication.java
create mode 100644 V4/target/classes/com/webserver/core/ClientHandler.class
create mode 100644 V4/target/classes/com/webserver/core/WebServerApplication.class
create mode 100644 V5/pom.xml
create mode 100644 V5/src/main/java/com/webserver/core/ClientHandler.java
create mode 100644 V5/src/main/java/com/webserver/core/WebServerApplication.java
create mode 100644 V5/src/main/java/com/webserver/http/HttpServletRequest.java
create mode 100644 V5/target/classes/com/webserver/core/ClientHandler.class
create mode 100644 V5/target/classes/com/webserver/core/WebServerApplication.class
create mode 100644 V5/target/classes/com/webserver/http/HttpServletRequest.class
create mode 100644 V6/pom.xml
create mode 100644 V6/src/main/java/com/webserver/core/ClientHandler.java
create mode 100644 V6/src/main/java/com/webserver/core/WebServerApplication.java
create mode 100644 V6/src/main/java/com/webserver/http/HttpServletRequest.java
create mode 100644 V6/src/main/resources/static/index.html
dell@DESKTOP-0II6H5B MINGW64 /d/dev-project/IdeaProjects/Web-Server2208 (master)
$ git branch
dev
* master
dell@DESKTOP-0II6H5B MINGW64 /d/dev-project/IdeaProjects/Web-Server2208 (master)
$ git push origin
git: 'credential-manager' is not a git command. See 'git --help'.
The most similar command is
credential-manager-core
Enumerating objects: 86, done.
Counting objects: 100% (86/86), done.
Delta compression using up to 4 threads
Compressing objects: 100% (48/48), done.
Writing objects: 100% (80/80), 21.16 KiB | 902.00 KiB/s, done.
Total 80 (delta 10), reused 0 (delta 0), pack-reused 0
remote: Powered by GITEE.COM [GNK-6.4]
To https://gitee.com/xyzbacjk/Web-Server2208.git
1d85459..432ff75 master -> master
齐活,push成功