本地git的分支名称变空的处理方法
2024-05-14 09:32:13
今天本地撸代码弄到一半想push一下...失败了
看了下分支名称突然变空了，不对啊，我本地的分支是master啊！
dell@DESKTOP-0II6H5B MINGW64 /d/dev-project/IdeaProjects/Web-Server2208 ((652e568...))
$ git branch
* (HEAD detached from 1d85459)master
重构了这么一大堆咋办啊？这时我想了下能否把本地的这个无名分支能和本地master合并
找了一篇文档
git之如何将分支代码合并到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.xmlnew file: V5/src/main/java/com/webserver/core/ClientHandler.javanew file: V5/src/main/java/com/webserver/core/WebServerApplication.javanew file: V5/src/main/java/com/webserver/http/HttpServletRequest.javanew file: V6/pom.xmlnew file: V6/src/main/java/com/webserver/core/ClientHandler.javanew file: V6/src/main/java/com/webserver/core/WebServerApplication.javanew file: V6/src/main/java/com/webserver/http/HttpServletRequest.javanew file: V6/src/main/resources/static/index.htmlChanges 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.mdmodified: V5/src/main/java/com/webserver/core/ClientHandler.javamodified: V5/src/main/java/com/webserver/http/HttpServletRequest.javamodified: V6/src/main/resources/static/index.htmlmodified: pom.xmlUntracked 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/.gitignorenew file: .idea/compiler.xmlnew file: .idea/jarRepositories.xmlnew file: .idea/misc.xmlnew file: .idea/uiDesigner.xmlnew file: .idea/vcs.xmlmodified: README.mdnew file: V1/target/classes/com/webserver/core/WebServerApplication.classnew file: V2/target/classes/com/webserver/core/ClientHandler.classnew file: V2/target/classes/com/webserver/core/WebServerApplication.classnew file: V3/target/classes/com/webserver/core/ClientHandler.classnew file: V3/target/classes/com/webserver/core/WebServerApplication.classnew file: V4/target/classes/com/webserver/core/ClientHandler.classnew file: V4/target/classes/com/webserver/core/WebServerApplication.classnew file: V5/pom.xmlnew file: V5/src/main/java/com/webserver/core/ClientHandler.javanew file: V5/src/main/java/com/webserver/core/WebServerApplication.javanew file: V5/src/main/java/com/webserver/http/HttpServletRequest.javanew file: V5/target/classes/com/webserver/core/ClientHandler.classnew file: V5/target/classes/com/webserver/core/WebServerApplication.classnew file: V5/target/classes/com/webserver/http/HttpServletRequest.classnew file: V6/pom.xmlnew file: V6/src/main/java/com/webserver/core/ClientHandler.javanew file: V6/src/main/java/com/webserver/core/WebServerApplication.javanew file: V6/src/main/java/com/webserver/http/HttpServletRequest.javanew file: V6/src/main/resources/static/index.htmlmodified: pom.xmldell@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/.gitignorecreate mode 100644 .idea/compiler.xmlcreate mode 100644 .idea/jarRepositories.xmlcreate mode 100644 .idea/misc.xmlcreate mode 100644 .idea/uiDesigner.xmlcreate mode 100644 .idea/vcs.xmlcreate mode 100644 V1/target/classes/com/webserver/core/WebServerApplication.classcreate mode 100644 V2/target/classes/com/webserver/core/ClientHandler.classcreate mode 100644 V2/target/classes/com/webserver/core/WebServerApplication.classcreate mode 100644 V3/target/classes/com/webserver/core/ClientHandler.classcreate mode 100644 V3/target/classes/com/webserver/core/WebServerApplication.classcreate mode 100644 V4/target/classes/com/webserver/core/ClientHandler.classcreate mode 100644 V4/target/classes/com/webserver/core/WebServerApplication.classcreate mode 100644 V5/pom.xmlcreate mode 100644 V5/src/main/java/com/webserver/core/ClientHandler.javacreate mode 100644 V5/src/main/java/com/webserver/core/WebServerApplication.javacreate mode 100644 V5/src/main/java/com/webserver/http/HttpServletRequest.javacreate mode 100644 V5/target/classes/com/webserver/core/ClientHandler.classcreate mode 100644 V5/target/classes/com/webserver/core/WebServerApplication.classcreate mode 100644 V5/target/classes/com/webserver/http/HttpServletRequest.classcreate mode 100644 V6/pom.xmlcreate mode 100644 V6/src/main/java/com/webserver/core/ClientHandler.javacreate mode 100644 V6/src/main/java/com/webserver/core/WebServerApplication.javacreate mode 100644 V6/src/main/java/com/webserver/http/HttpServletRequest.javacreate mode 100644 V6/src/main/resources/static/index.htmldell@DESKTOP-0II6H5B MINGW64 /d/dev-project/IdeaProjects/Web-Server2208 ((432ff75...))
$ git branch
* (HEAD detached from 1d85459)masterdell@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)masterdell@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)masterdell@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> 432ff75Switched 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
origindell@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 iscredential-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> 432ff75Switched 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 432ff75dell@DESKTOP-0II6H5B MINGW64 /d/dev-project/IdeaProjects/Web-Server2208 (master)
$ git branchdev
* masterdell@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..432ff75dell@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.
Abortingdell@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 bytesV4/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 bytesV5/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 bytesV6/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/.gitignorecreate mode 100644 .idea/compiler.xmlcreate mode 100644 .idea/jarRepositories.xmlcreate mode 100644 .idea/misc.xmlcreate mode 100644 .idea/uiDesigner.xmlcreate mode 100644 .idea/vcs.xmlcreate mode 100644 V1/target/classes/com/webserver/core/WebServerApplication.classcreate mode 100644 V2/target/classes/com/webserver/core/ClientHandler.classcreate mode 100644 V2/target/classes/com/webserver/core/WebServerApplication.classcreate mode 100644 V3/target/classes/com/webserver/core/ClientHandler.classcreate mode 100644 V3/target/classes/com/webserver/core/WebServerApplication.classcreate mode 100644 V4/pom.xmlcreate mode 100644 V4/src/main/java/com/webserver/core/ClientHandler.javacreate mode 100644 V4/src/main/java/com/webserver/core/WebServerApplication.javacreate mode 100644 V4/target/classes/com/webserver/core/ClientHandler.classcreate mode 100644 V4/target/classes/com/webserver/core/WebServerApplication.classcreate mode 100644 V5/pom.xmlcreate mode 100644 V5/src/main/java/com/webserver/core/ClientHandler.javacreate mode 100644 V5/src/main/java/com/webserver/core/WebServerApplication.javacreate mode 100644 V5/src/main/java/com/webserver/http/HttpServletRequest.javacreate mode 100644 V5/target/classes/com/webserver/core/ClientHandler.classcreate mode 100644 V5/target/classes/com/webserver/core/WebServerApplication.classcreate mode 100644 V5/target/classes/com/webserver/http/HttpServletRequest.classcreate mode 100644 V6/pom.xmlcreate mode 100644 V6/src/main/java/com/webserver/core/ClientHandler.javacreate mode 100644 V6/src/main/java/com/webserver/core/WebServerApplication.javacreate mode 100644 V6/src/main/java/com/webserver/http/HttpServletRequest.javacreate mode 100644 V6/src/main/resources/static/index.htmldell@DESKTOP-0II6H5B MINGW64 /d/dev-project/IdeaProjects/Web-Server2208 (master)
$ git branchdev
* masterdell@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 iscredential-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.git1d85459..432ff75 master -> master
齐活，push成功
本地git的分支名称变空的处理方法相关推荐
- git base , 版本合并：git的分支与合并的两种方法 - 方法1：git merge
1git merge 其实就是很简单一件事: 1 找到分支节点ID 并copy 下来 git command git log -g 或者 git win 2 切到分支 $ git reset --ha ...
- git 修改分支名称 --- git branch -m
对git不了解的小伙伴可以戳这里: git合并代码 git对大小写文件不敏感 git 强制覆盖远程分支 --force git 大家肯定都用到过,在开发的时候,用它进行版本控制,这里就要提到分支了. ...
- Git修改分支名称（local remote）
2019独角兽企业重金招聘Python工程师标准>>> git branch -m old_branch new_branch # Rename branch locally git ...
- git切换分支保存修改的代码的方法
刚才做操作发现一个问题,就是本地有一个old分支,此时本地又new了一个新的分支,那么我在old分支上做修改后切换到new分支上,发现文件是修改后的.原本理解是一个分支一套代码,那么为什么此时代码是一 ...
- WIN10电脑创建文件夹和更改文件夹名称变慢的解决方法
电脑用着用着,突然之间更改文件夹名称就变慢了,要卡2秒左右才能改成功,怎么办? 一顿瞎折腾,该清理的灰尘清了,内存条也换了,电脑外壳也被我拆得到处是痕迹了,然而我的脑壳还是那么疼. 怎么办呢?莫慌,w ...
- 关于Android 8.0/9.0 之后获取wifi名称为空的解决方法
今天连接硬件设备的时候,需要用到wifi名和密码来进行绑定配对.在获取wifi名的时候,意外发现为空.于是就开始找寻解决方案. 后来找到这么一篇文章: Android获取WIFI 的ssid 方法适配 ...
- # 如何在Git上更改本地分支名称和远程分支名称
有时候我们需要修改git分支名称,例如不合理的分支名称.本篇文章分享了如何轻松地修改Git本地分支名称和修改远程分支名称. 在Git中,通常使用分支来使开发与您的主要工作流程分开.在软件工程团队中,通 ...
- 如何重命名本地Git分支？
我不想重命名远程分支,如重命名本地和远程Git存储库的master分支中所述. 如何重命名尚未推送到远程分支的本地分支? 如果您还需要重命名远程分支: 如何重命名Git本地和远程分支名称 #1楼 gi ...
- 终端中显示git分支名称的方法
终端中显示git分支名称的方法 大家好,我叫亓官劼(qí guān jié ),在CSDN中记录学习的点滴历程,时光荏苒,未来可期,加油~博客地址为:亓官劼的博客,B站昵称为:亓官劼,地址为亓官劼 ...
最新文章
- java xml 变量替换_Java JAXB如何将XmlElements重新定义为现有变量
- 交互式计算机图形学总结：第四章 观察
- linux中进程的控制总结,Linux中的进程控制
- 让系统尽量不用swap
- 东芝出售西屋电气在即
- 单片机的C语言中位操作用法
- unity2018关联不到vs_Unity2018 VS2017打开CS脚本，提示全红及无法加载工程等问题解决...
- 菲尼克斯电源模块QUINT-PS3AC24DC40的组装说明
- 三分钟教你如何做好网站备案
- Registry Workshop —— 强大的注册表编辑工具
- 被马斯克热炒的人形机器人Optimus“擎天柱“，中国厂商或后来居上
- 文件夹的使用、常见术语缩写
- Dolphinscheduler/海豚调度器的安装
- vue高德地图marker批量标记与InfoWindow提示框
- android微信刷脸支付宝,录指纹、敲密码太麻烦，OPPO Find X完成安卓首个微信刷脸支付...
- 机械臂抓取实验笔记总结
- python利用selenium爬取京东数据
- 华为2018优招 解决方案技术工程师
- 深度学习学习笔记-论文研读4-基于深度强化学习的多用户边缘计算任务卸载调度与资源分配算法
- 权限系统(vue+elementui)设计