首页 > 其他分享 >HEAD detached from originmaster

HEAD detached from originmaster

时间:2023-09-23 13:13:03浏览次数:40  
标签:HEAD java thread create originmaster mode detached 100644 example

HEAD detached from originmaster

参考文档:

git commit 时报错HEAD detached from 85e119d nothing to commit, working tree clean问题解决 - 简书 (jianshu.com)

image

liuzonglin@LAPTOP-CGO0UV3J MINGW64 /d/.github/java-dome ((a0734b5...))                                                                                                                                                                            
$ git commit -m "日常更新"
HEAD detached from origin/master
nothing to commit, working tree clean

liuzonglin@LAPTOP-CGO0UV3J MINGW64 /d/.github/java-dome ((a0734b5...))                                                                                                                                                                            
$ ^C

liuzonglin@LAPTOP-CGO0UV3J MINGW64 /d/.github/java-dome ((a0734b5...))                                                                                                                                                                            
$ git branch v

liuzonglin@LAPTOP-CGO0UV3J MINGW64 /d/.github/java-dome ((a0734b5...))                                                                                                                                                                            
$ git branch -v
* (HEAD detached from origin/master) a0734b5 日常更新
  master                             89ecd4a new file dubbo-api-task  deleted springboot-rabbitmq
  v                                  a0734b5 日常更新
liuzonglin@LAPTOP-CGO0UV3J MINGW64 /d/.github/java-dome ((a0734b5...))                                                                                                                                                                            
$ git checkout master
Previous HEAD position was a0734b5 日常更新
Switched to branch 'master'
Your branch is up to date with 'origin/master'.

liuzonglin@LAPTOP-CGO0UV3J MINGW64 /d/.github/java-dome (master)                                                                                                                                                                                  
$ git merge a0734b5
Updating 89ecd4a..a0734b5
Fast-forward
 .gitignore                                         |   3 +-                                                                                                                                                                                      
 data-structure/README.md                           |   5 +                                                                                                                                                                                       
 data-structure/build.gradle                        |  19 ++                                                                                                                                                                                      
 data-structure/gradle/wrapper/gradle-wrapper.jar   | Bin 0 -> 59821 bytes
 .../gradle/wrapper/gradle-wrapper.properties       |   5 +                                                                                                                                                                                       
 data-structure/gradlew                             | 234 +++++++++++++++++++++                                                                                                                                                                   
 data-structure/gradlew.bat                         |  89 ++++++++                                                                                                                                                                                
 data-structure/settings.gradle                     |   2 +                                                                                                                                                                                       
 .../src/main/java/org/example/common/Utils.java    |  61 ++++++                                                                                                                                                                                  
 .../main/java/org/example/heap/HeapShiftUp.java    |  65 ++++++                                                                                                                                                                                  
 .../src/main/java/org/example/heap/MaxHeap.java    |  37 ++++                                                                                                                                                                                    
 .../main/java/org/example/sort/InsertionSort.java  |  36 ++++                                                                                                                                                                                    
 .../main/java/org/example/sort/SelectionSort.java  |  35 +++
 .../dubbo-spring-boot-demo-consumer/pom.xml        |  19 ++                                                                                                                                                                                      
 .../dubbo-spring-boot-demo-interface/pom.xml       |  19 ++                                                                                                                                                                                      
 .../dubbo-spring-boot-demo-provider/pom.xml        |  19 ++                                                                                                                                                                                      
 dubbo-spring-boot-demo/pom.xml                     |  67 ++++++                                                                                                                                                                                  
 .../example/sys/controller/LoginController.java    |   1 -                                                                                                                                                                                       
 thread/README.md                                   |   1 +                                                                                                                                                                                       
 thread/build.gradle                                |  19 ++                                                                                                                                                                                      
 thread/gradle/wrapper/gradle-wrapper.jar           | Bin 0 -> 59821 bytes
 thread/gradle/wrapper/gradle-wrapper.properties    |   5 +                                                                                                                                                                                       
 thread/gradlew                                     | 234 +++++++++++++++++++++                                                                                                                                                                   
 thread/gradlew.bat                                 |  89 ++++++++                                                                                                                                                                                
 thread/settings.gradle                             |   2 +                                                                                                                                                                                       
 .../java/org/example/Number/ThreadPoolTest.java    |  67 ++++++                                                                                                                                                                                  
 .../java/org/example/sync/SaleTicketDemo3.java     |  36 ++++                                                                                                                                                                                    
 .../java/org/example/sync/SaleTicketDemo4.java     |  31 +++                                                                                                                                                                                     
 .../java/org/example/sync/SaleTicketDemo5.java     |  61 ++++++                                                                                                                                                                                  
 .../main/java/org/example/thread/LifeCycle.java    |  43 ++++                                                                                                                                                                                    
 thread/src/main/java/org/example/thread/Main.java  |  17 ++                                                                                                                                                                                      
 .../main/java/org/example/thread/MyRunnable.java   |  20 ++                                                                                                                                                                                      
 .../src/main/java/org/example/thread/MyThread.java |  37 ++++                                                                                                                                                                                    
 .../java/org/example/thread/ThreadStateChange.java |  33 +++                                                                                                                                                                                     
 .../java/org/example/volatiles/volatileTest.java   |  49 +++++                                                                                                                                                                                   
 35 files changed, 1458 insertions(+), 2 deletions(-)
 create mode 100644 data-structure/README.md
 create mode 100644 data-structure/build.gradle
 create mode 100644 data-structure/gradle/wrapper/gradle-wrapper.jar
 create mode 100644 data-structure/gradle/wrapper/gradle-wrapper.properties
 create mode 100644 data-structure/gradlew
 create mode 100644 data-structure/gradlew.bat
 create mode 100644 data-structure/settings.gradle
 create mode 100644 data-structure/src/main/java/org/example/common/Utils.java
 create mode 100644 data-structure/src/main/java/org/example/heap/HeapShiftUp.java
 create mode 100644 data-structure/src/main/java/org/example/heap/MaxHeap.java
 create mode 100644 data-structure/src/main/java/org/example/sort/InsertionSort.java
 create mode 100644 data-structure/src/main/java/org/example/sort/SelectionSort.java
 create mode 100644 dubbo-spring-boot-demo/dubbo-spring-boot-demo-consumer/pom.xml
 create mode 100644 dubbo-spring-boot-demo/dubbo-spring-boot-demo-interface/pom.xml
 create mode 100644 dubbo-spring-boot-demo/dubbo-spring-boot-demo-provider/pom.xml
 create mode 100644 dubbo-spring-boot-demo/pom.xml
 create mode 100644 thread/README.md
 create mode 100644 thread/build.gradle
 create mode 100644 thread/gradle/wrapper/gradle-wrapper.jar
 create mode 100644 thread/gradle/wrapper/gradle-wrapper.properties
 create mode 100644 thread/gradlew
 create mode 100644 thread/gradlew.bat
 create mode 100644 thread/settings.gradle
 create mode 100644 thread/src/main/java/org/example/Number/ThreadPoolTest.java
 create mode 100644 thread/src/main/java/org/example/sync/SaleTicketDemo3.java
 create mode 100644 thread/src/main/java/org/example/sync/SaleTicketDemo4.java
 create mode 100644 thread/src/main/java/org/example/sync/SaleTicketDemo5.java
 create mode 100644 thread/src/main/java/org/example/thread/LifeCycle.java
 create mode 100644 thread/src/main/java/org/example/thread/Main.java
 create mode 100644 thread/src/main/java/org/example/thread/MyRunnable.java
 create mode 100644 thread/src/main/java/org/example/thread/MyThread.java
 create mode 100644 thread/src/main/java/org/example/thread/ThreadStateChange.java
 create mode 100644 thread/src/main/java/org/example/volatiles/volatileTest.java

liuzonglin@LAPTOP-CGO0UV3J MINGW64 /d/.github/java-dome (master)                                                                                                                                                                                  
$ git branch -v
* master a0734b5 [ahead 1] 日常更新
  v      a0734b5 日常更新

liuzonglin@LAPTOP-CGO0UV3J MINGW64 /d/.github/java-dome (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

liuzonglin@LAPTOP-CGO0UV3J MINGW64 /d/.github/java-dome (master)                                                                                                                                                                                  
$ git push
Enumerating objects: 76, done.
Counting objects: 100% (76/76), done.
Delta compression using up to 12 threads
Compressing objects: 100% (45/45), done.
Writing objects: 100% (65/65), 69.56 KiB | 7.73 MiB/s, done.
Total 65 (delta 9), reused 0 (delta 0), pack-reused 0
remote: Powered by GITEE.COM [GNK-6.4]
To https://gitee.com/liuzonglin1/java-dome.git
   89ecd4a..a0734b5  master -> master

liuzonglin@LAPTOP-CGO0UV3J MINGW64 /d/.github/java-dome (master)                                                                                                                                                                                  
$ 

标签:HEAD,java,thread,create,originmaster,mode,detached,100644,example
From: https://www.cnblogs.com/liuzonglin/p/17724245.html

相关文章

  • x-headers 搜集
    英文链接:http://mobiforge.com/developing/blog/useful-x-headersX头域解析191个读者  biAji  双语对照  原文 简介本文对http协议中未曾涉及到,而移动设备网络开发又经常遇到的x头域做了简要的解析X头域解析我最近开始以搜集"X-headers" 头域为乐。X头域是HTTP请求中......
  • HeadFirst设计模式学习之责任链模式
    【一】介绍引入当你想要让一个以上的对象有机会能够处理某个请求的时候,就使用责任链模式(ChainofResponsibilityPattern)。【二】场景引入自从推出Java版本的糖果机之后,万能糖果公司收到的电子邮件数量已超出他们所能处理的范围。据他们自己分析,所收到的电子邮件有四类:......
  • 【Azure 存储服务】访问Azure Blob File遇见400-Condition Headers not support错误的
    问题描述在微软云存储账号的服务中,存储一些静态图片,然后通过AppService访问,但是遇见了400-conditionheadersnotsupport错误。在单独通过浏览器访问FileShare中的文件,发现第一次可以请求成功,但是第二次刷新后就遇见400错误,第三次刷新的时候又访问成功,如此循环下去。错误消......
  • 【Azure 存储服务】访问Azure Blob File遇见400-Condition Headers not support错误的
    问题描述在微软云存储账号的服务中,存储一些静态图片,然后通过AppService访问,但是遇见了400-conditionheadersnotsupport错误。在单独通过浏览器访问FileShare中的文件,发现第一次可以请求成功,但是第二次刷新后就遇见400错误,第三次刷新的时候又访问成功,如此循环下去。错......
  • 改进了headers的爬虫(Cookies)
    importurllib.requestfromlxmlimportetreedefcreate_request(page):ifpage==1:url='http://www.chinaeol.net/hjxw/gnxw'else:url='http://www.chinaeol.net/hjxw/gnxw/index_'+str(page)+'.shtml�......
  • HeaderedContentControl实现左右对称
    <Button.Content><HeaderedContentControl><HeaderedContentControl.Template><ControlTemplateTargetType="HeaderedContentControl"><Grid>......
  • HeadFirst设计模式学习之OO设计模式入门
    【一】引入---鸭子无论在哪门编程语言中,都离不开我们最熟悉的鸭子模型,因此作者在引入部分也是利用鸭子作为案例引入我们进行入门的学习【1】鸭子游戏现在我们需要做一款模拟鸭子游泳的游戏在游戏中,有不同的鸭子,不同的鸭子都会游泳和呱呱叫而这款游戏的实现思路就是一......
  • [Servlet/Tomcat] HttpServletRequest#getHeader(headerNameWithIgnoreCase)(获取heade
    1故事背景最近项目上有个业务需求,翻译成技术需求,即:将request.headers中的几个header入参转换成request.body(pageRequest)中的内置参数。为便于灵活配置,header参数名称是动态可配置的(存放于nacos配置中心),比如:sysCode、Accept-Language技术实现,主要就springmvc的org.spr......
  • [SpringSecurity5.6.2源码分析十]:HeaderWriterFilter
    前言• 为了安全考虑,添加启用浏览器保护的某些头是很有用的,比如X-Frame-Options,X-XSS-Protection和X-Content-Type-Options• 而HeaderWriterFilter就支持往响应头写入各种响应头1、HeadersConfigurer• HeadersConfigurer是HeaderWriterFilter对应的配置类,是在获取HttpSecur......
  • 【git pull】 error: You have not concluded your merge (MERGE_HEAD exists).
    问题$gitpullerror:Youhavenotconcludedyourmerge(MERGE_HEADexists).......