git分支开发练习以及创建文件提交到版本库
学习记录(两个问题练习):
问题1:
提前编写好的三个文件:
代码:
sunyu@LAPTOP-T5VO94NM MINGW64 /d/javademo (master)
$ cd d:sunyu@LAPTOP-T5VO94NM MINGW64 /d
$ mkdir shixunsunyu@LAPTOP-T5VO94NM MINGW64 /d
$ cd shixunsunyu@LAPTOP-T5VO94NM MINGW64 /d/shixun
$ mkdir htmlsunyu@LAPTOP-T5VO94NM MINGW64 /d/shixun
$ cd htmlsunyu@LAPTOP-T5VO94NM MINGW64 /d/shixun/html
$ touch readme.mdsunyu@LAPTOP-T5VO94NM MINGW64 /d/shixun/html
$ lssunyu@LAPTOP-T5VO94NM MINGW64 /d/shixun/html
$ git init
Initialized empty Git repository in D:/shixun/html/.git/sunyu@LAPTOP-T5VO94NM MINGW64 /d/shixun/html (master)
$ touch readme.mdsunyu@LAPTOP-T5VO94NM MINGW64 /d/shixun/html (master)
$ git branch**## 此处将index.html拖入html文件夹!!!**sunyu@LAPTOP-T5VO94NM MINGW64 /d/shixun/html (master)
$ git add .sunyu@LAPTOP-T5VO94NM MINGW64 /d/shixun/html (master)
$ git commit -m "添加项目的readme介绍文件!!!"
[master (root-commit) 8157c4f] 添加项目的readme介绍文件!!!1 file changed, 0 insertions(+), 0 deletions(-)create mode 100644 readme.mdsunyu@LAPTOP-T5VO94NM MINGW64 /d/shixun/html (master)
$ git branch
* mastersunyu@LAPTOP-T5VO94NM MINGW64 /d/shixun/html (master)
$ git branch sy_htmlsunyu@LAPTOP-T5VO94NM MINGW64 /d/shixun/html (master)
$ git branch
* mastersy_htmlsunyu@LAPTOP-T5VO94NM MINGW64 /d/shixun/html (master)
$ git checkout sy_html
Switched to branch 'sy_html'sunyu@LAPTOP-T5VO94NM MINGW64 /d/shixun/html (sy_html)
$ git branchmaster
* sy_htmlsunyu@LAPTOP-T5VO94NM MINGW64 /d/shixun/html (sy_html)
$ ls
index.html readme.mdsunyu@LAPTOP-T5VO94NM MINGW64 /d/shixun/html (sy_html)
$ git status
On branch sy_html
Untracked files:(use "git add <file>..." to include in what will be committed)index.htmlnothing added to commit but untracked files present (use "git add" to track)sunyu@LAPTOP-T5VO94NM MINGW64 /d/shixun/html (sy_html)
$ git add index.html
warning: LF will be replaced by CRLF in index.html.
The file will have its original line endings in your working directory.sunyu@LAPTOP-T5VO94NM MINGW64 /d/shixun/html (sy_html)
$ git stastus
git: 'stastus' is not a git command. See 'git --help'.The most similar command isstatussunyu@LAPTOP-T5VO94NM MINGW64 /d/shixun/html (sy_html)
$ git commit -m "sy完成了index开发!"
[sy_html 58735ed] sy完成了index开发!1 file changed, 14 insertions(+)create mode 100644 index.htmlsunyu@LAPTOP-T5VO94NM MINGW64 /d/shixun/html (sy_html)
$ git checkout master
Switched to branch 'master'sunyu@LAPTOP-T5VO94NM MINGW64 /d/shixun/html (master)
$ git checkout sy_html
Switched to branch 'sy_html'sunyu@LAPTOP-T5VO94NM MINGW64 /d/shixun/html (sy_html)
$ touch index.csssunyu@LAPTOP-T5VO94NM MINGW64 /d/shixun/html (sy_html)
$ git status
On branch sy_html
Untracked files:(use "git add <file>..." to include in what will be committed)index.cssnothing added to commit but untracked files present (use "git add" to track)sunyu@LAPTOP-T5VO94NM MINGW64 /d/shixun/html (sy_html)
$ git checkout master
Switched to branch 'master'sunyu@LAPTOP-T5VO94NM MINGW64 /d/shixun/html (master)
$ rm index.csssunyu@LAPTOP-T5VO94NM MINGW64 /d/shixun/html (master)
$ git status
On branch master
nothing to commit, working tree cleansunyu@LAPTOP-T5VO94NM MINGW64 /d/shixun/html (master)
$ git checkout -b sy_css
Switched to a new branch 'sy_css'****## 此处将index.css拖入html文件夹!!!****sunyu@LAPTOP-T5VO94NM MINGW64 /d/shixun/html (sy_css)
$ git add .sunyu@LAPTOP-T5VO94NM MINGW64 /d/shixun/html (sy_css)
$ git commit -m "sy在sy_css完成了index.css开发!"
[sy_css 17f5f17] sy在sy_css完成了index.css开发!1 file changed, 7 insertions(+)create mode 100644 index.csssunyu@LAPTOP-T5VO94NM MINGW64 /d/shixun/html (sy_css)
$ git checkout master
Switched to branch 'master'sunyu@LAPTOP-T5VO94NM MINGW64 /d/shixun/html (master)
$ git checkout -b sy_js
Switched to a new branch 'sy_js'**## 此处将index.js拖入html文件夹!!!**sunyu@LAPTOP-T5VO94NM MINGW64 /d/shixun/html (sy_js)
$ git add .sunyu@LAPTOP-T5VO94NM MINGW64 /d/shixun/html (sy_js)
$ git commit -m "sy在sy_js提交了index.js文件"
[sy_js 0c5bc50] sy在sy_js提交了index.js文件1 file changed, 5 insertions(+)create mode 100644 index.jssunyu@LAPTOP-T5VO94NM MINGW64 /d/html (sy_js)
$ git checkout master
Switched to branch 'master'sunyu@LAPTOP-T5VO94NM MINGW64 /d/html (master)
$ git branch
* mastersy_csssy_htmlsy_jssunyu@LAPTOP-T5VO94NM MINGW64 /d/html (master)
$ git branch -d sy_css
error: The branch 'sy_css' is not fully merged.
If you are sure you want to delete it, run 'git branch -D sy_css'.sunyu@LAPTOP-T5VO94NM MINGW64 /d/html (master)
$ clearsunyu@LAPTOP-T5VO94NM MINGW64 /d/html (master)
$ git merge sy_html
Updating 530fe2e..f630c2d
Fast-forwardindex.html | 14 ++++++++++++++1 file changed, 14 insertions(+)create mode 100644 index.htmlsunyu@LAPTOP-T5VO94NM MINGW64 /d/html (master)
$ git merge sy_css
Merge made by the 'recursive' strategy.index.css | 7 +++++++1 file changed, 7 insertions(+)create mode 100644 index.csssunyu@LAPTOP-T5VO94NM MINGW64 /d/html (master)
$ git merge sy_js
Merge made by the 'recursive' strategy.index.js | 5 +++++1 file changed, 5 insertions(+)create mode 100644 index.jssunyu@LAPTOP-T5VO94NM MINGW64 /d/html (master)
$ git branch
* mastersy_csssy_htmlsy_jssunyu@LAPTOP-T5VO94NM MINGW64 /d/html (master)
$ git branch -d sy_css
Deleted branch sy_css (was 7e7048f).sunyu@LAPTOP-T5VO94NM MINGW64 /d/html (master)
$ gitk
结果:
问题2:
代码:
sunyu@LAPTOP-T5VO94NM MINGW64 ~
$ cd d:sunyu@LAPTOP-T5VO94NM MINGW64 /d
$ mkdir javademosunyu@LAPTOP-T5VO94NM MINGW64 /d
$ cd javademosunyu@LAPTOP-T5VO94NM MINGW64 /d/javademo
$ git init
Initialized empty Git repository in D:/javademo/.git/sunyu@LAPTOP-T5VO94NM MINGW64 /d/javademo (master)
$ touch a.javasunyu@LAPTOP-T5VO94NM MINGW64 /d/javademo (master)
$ git add .sunyu@LAPTOP-T5VO94NM MINGW64 /d/javademo (master)
$ git commit -m "提交a.java类!"*** Please tell me who you are.Rungit config --global user.email "you@example.com"git config --global user.name "Your Name"to set your account's default identity.
Omit --global to set the identity only in this repository.fatal: unable to auto-detect email address (got 'sunyu@LAPTOP-T5VO94NM.(none)')sunyu@LAPTOP-T5VO94NM MINGW64 /d/javademo (master)
$ git config --global user.name "ssssy"sunyu@LAPTOP-T5VO94NM MINGW64 /d/javademo (master)
$ git config --global user.email "123456789@qq.com"sunyu@LAPTOP-T5VO94NM MINGW64 /d/javademo (master)
$ git commit -m "提交a.java类!"
[master (root-commit) 7087920] 提交a.java类!1 file changed, 0 insertions(+), 0 deletions(-)create mode 100644 a.javasunyu@LAPTOP-T5VO94NM MINGW64 /d/javademo (master)
$ mv a.java b.javasunyu@LAPTOP-T5VO94NM MINGW64 /d/javademo (master)
$ git add b.javasunyu@LAPTOP-T5VO94NM MINGW64 /d/javademo (master)
$ git rm a.java
rm 'a.java'sunyu@LAPTOP-T5VO94NM MINGW64 /d/javademo (master)
$ git status
On branch master
Changes to be committed:(use "git reset HEAD <file>..." to unstage)renamed: a.java -> b.javasunyu@LAPTOP-T5VO94NM MINGW64 /d/javademo (master)
$ git commit -m "修改了文件命名a-b.java"
[master a9b288d] 修改了文件命名a-b.java1 file changed, 0 insertions(+), 0 deletions(-)rename a.java => b.java (100%)sunyu@LAPTOP-T5VO94NM MINGW64 /d/javademo (master)
$ vim b.javasunyu@LAPTOP-T5VO94NM MINGW64 /d/javademo (master)
$ git add .
warning: LF will be replaced by CRLF in b.java.
The file will have its original line endings in your working directory.sunyu@LAPTOP-T5VO94NM MINGW64 /d/javademo (master)
$ git commit -m "修改了b.java的内容!!!"
[master 8dc745b] 修改了b.java的内容!!!1 file changed, 1 insertion(+)sunyu@LAPTOP-T5VO94NM MINGW64 /d/javademo (master)
$ rm b.javasunyu@LAPTOP-T5VO94NM MINGW64 /d/javademo (master)
$ git rm b.java
rm 'b.java'sunyu@LAPTOP-T5VO94NM MINGW64 /d/javademo (master)
$ git commit -m "删除了b.java!!!"
git commit -m "删除了b.javagit rm b.java!"
[master 7175fd5] 删除了b.javagit rm b.java!1 file changed, 1 deletion(-)delete mode 100644 b.javasunyu@LAPTOP-T5VO94NM MINGW64 /d/javademo (master)
$ gitk
结果如图所示:
Day01结果!!!
git分支开发练习以及创建文件提交到版本库相关推荐
- Git 分支开发规范
您必须知道的 Git 分支开发规范 Git 是目前最流行的源代码管理工具. 为规范开发,保持代码提交记录以及 git 分支结构清晰,方便后续维护,现规范 git 的相关操作. 分支管理 分支命名 ma ...
- Git学习(了解版本控制、Git安装配置、Git基本理论、Git搭建、Git文件操作、使用码云或Github、IDEA集成Git,Git分支开发)
学习git之前,我们需要先明白一个概念,版本控制! 版本控制 什么是版本控制 版本迭代,新的版本!版本管理器. 版本控制(Revision Control)是一种在开发的过程中用于管理我们对文件.目录 ...
- git 换行问题_后端必备的 Git 分支开发规范指南
作者:稻草叔叔来源:https://juejin.im/post/5b4328bbf265da0fa21a6820 Git 是目前最流行的源代码管理工具.为规范开发,保持代码提交记录以及 git 分支 ...
- 后端必备 Git 分支开发:规范指南
点击上方蓝色"方志朋",选择"设为星标" 回复"666"获取独家整理的学习资料! https://www.cnblogs.com/herol ...
- 合并分支到master_我敢打赌!这是全网最全的 Git 分支开发规范手册
来源:https://juejin.im/post/684490... Git 是目前最流行的源代码管理工具.为规范开发,保持代码提交记录以及 git 分支结构清晰,方便后续维护,现规范 git 的相 ...
- 程序员必备 Git 分支开发规范指南
Git 是目前最流行的源代码管理工具.为规范开发,保持代码提交记录以及 git 分支结构清晰,方便后续维护,现规范 git 的相关操作. 分支管理 分支命名 master 分支 master 为主分支 ...
- 送你一份后端必备的 Git 分支开发规范指南
作者:稻草叔叔 juejin.im/post/5b4328bbf265da0fa21a6820 Git 是目前最流行的源代码管理工具.为规范开发,保持代码提交记录以及 git 分支结构清晰,方便后续维 ...
- git中的工作区,暂存区,版本库
git status 用于查看哪些文件被暂存了 红色:工作区与版本库之间对比 ,说明没有被暂存 git add . (工作区的内容添加到暂存区) 黄绿色:暂存区和版本库,说明被暂存
- idea创建git分支开发
1.创建分支,输入名称.这里分支起名为:dev 2. 创建好后,自动切换分支 3.即可在次基础上开发.提交后,push到dev即可 4.分支切换.点击分支---checkout即可
最新文章
- iOS progressive Web App (PWA) 技术
- ResNet最强改进版来啦!ResNest在多项任务中达到SOTA
- 更改centos 5 yum源
- 如何查看抓包文件所使用的捕获过滤器
- retinaface mnn
- C++中初始化列表的使用
- html显示php值,HTML窗体加载显示通过PHP的十六进制值
- 互联网产品初期需求确定与数据库模型设计——基于Visio和Xmind
- [JavaWeb-MySQL]多表查询(内连接,外连接,子查询)
- php session和cookie区别,php中session和cookie的区别是什么?
- qt int转换成qstring_Qt 加载cern-root库 并调用root类
- android自定义tab的分隔符,TabView中的分隔符
- 裁员下老公老婆的对话
- 【读书笔记】 —— 公平与正义
- 如何为MindManager时间表思维导图添加春节假期?
- 【斗地主 javascript js 斗地主 AI 人机 网页在线】基于专家系统的斗地主AI算法
- qq轻聊版打开后显示服务器返回数据错误,电脑qq登录报错误报告如何处理_qq打开显示错误报告的解决方法...
- 最新傻妞搭建方法以及常见问题2022年9月25
- 34亿骗局!如何“杀死”萝卜章?
- 数字人体”视觉挑战赛-宫颈癌风险智能诊断
热门文章
- 论文笔记2:Deep Attention Recurrent Q-Network
- 拉格朗日粒子扩散模式FLEXPART,在大气污染溯源中的应用
- Linux服务器开发,Posix API与网络协议栈
- 接口文档当中,英文字母代表的含义
- LVGL 8.0 lv_demo_widgets的学习
- Android笔试题大全(持续更新中),安卓应用开发项目
- 解决Unable to determine application id: com.android.tools.idea.run.ApkProvisionException:
- 分析可执行文件mach-o
- Android官方技术文档翻译——新构建系统概述
- 复选框的name属性