git分支开发练习以及创建文件提交到版本库

学习记录(两个问题练习):
问题1
问题2
问题1:
提前编写好的三个文件:三个文件
代码:

sunyu@LAPTOP-T5VO94NM MINGW64 /d/javademo (master)
$ cd d:

sunyu@LAPTOP-T5VO94NM MINGW64 /d
$ mkdir shixun

sunyu@LAPTOP-T5VO94NM MINGW64 /d
$ cd shixun

sunyu@LAPTOP-T5VO94NM MINGW64 /d/shixun
$ mkdir html

sunyu@LAPTOP-T5VO94NM MINGW64 /d/shixun
$ cd html

sunyu@LAPTOP-T5VO94NM MINGW64 /d/shixun/html
$ touch readme.md

sunyu@LAPTOP-T5VO94NM MINGW64 /d/shixun/html
$ ls

sunyu@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.md

sunyu@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.md

sunyu@LAPTOP-T5VO94NM MINGW64 /d/shixun/html (master)
$ git branch
* master

sunyu@LAPTOP-T5VO94NM MINGW64 /d/shixun/html (master)
$ git branch sy_html

sunyu@LAPTOP-T5VO94NM MINGW64 /d/shixun/html (master)
$ git branch
* master
  sy_html

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)
$ git branch
  master
* sy_html

sunyu@LAPTOP-T5VO94NM MINGW64 /d/shixun/html (sy_html)
$ ls
index.html  readme.md

sunyu@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.html

nothing 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 is
        status

sunyu@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.html

sunyu@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.css

sunyu@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.css

nothing 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.css

sunyu@LAPTOP-T5VO94NM MINGW64 /d/shixun/html (master)
$ git status
On branch master
nothing to commit, working tree clean

sunyu@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.css

sunyu@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.js

sunyu@LAPTOP-T5VO94NM MINGW64 /d/html (sy_js)
$ git checkout master
Switched to branch 'master'

sunyu@LAPTOP-T5VO94NM MINGW64 /d/html (master)
$ git branch
* master
  sy_css
  sy_html
  sy_js

sunyu@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)
$ clear

sunyu@LAPTOP-T5VO94NM MINGW64 /d/html (master)
$ git merge sy_html
Updating 530fe2e..f630c2d
Fast-forward
 index.html | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 index.html

sunyu@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.css

sunyu@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.js

sunyu@LAPTOP-T5VO94NM MINGW64 /d/html (master)
$ git branch
* master
  sy_css
  sy_html
  sy_js

sunyu@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 javademo

sunyu@LAPTOP-T5VO94NM MINGW64 /d
$ cd javademo

sunyu@LAPTOP-T5VO94NM MINGW64 /d/javademo
$ git init
Initialized empty Git repository in D:/javademo/.git/

sunyu@LAPTOP-T5VO94NM MINGW64 /d/javademo (master)
$ touch a.java

sunyu@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.

Run

  git 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.java

sunyu@LAPTOP-T5VO94NM MINGW64 /d/javademo (master)
$ mv a.java b.java

sunyu@LAPTOP-T5VO94NM MINGW64 /d/javademo (master)
$ git add b.java

sunyu@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.java


sunyu@LAPTOP-T5VO94NM MINGW64 /d/javademo (master)
$ git commit -m "修改了文件命名a-b.java"
[master a9b288d] 修改了文件命名a-b.java
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename a.java => b.java (100%)

sunyu@LAPTOP-T5VO94NM MINGW64 /d/javademo (master)
$ vim b.java

sunyu@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.java

sunyu@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.java

sunyu@LAPTOP-T5VO94NM MINGW64 /d/javademo (master)
$ gitk

结果如图所示:
结果
Day01结果!!!

  • 0
    点赞
  • 0
    收藏
    觉得还不错? 一键收藏
  • 1
    评论
很抱歉,作为一个文本AI模型,我无法直接执行命令并生成命令历史记录。但是,我可以提供一个示例步骤来完成你的需求。请按照以下步骤在本地的Git中完成练习: 1. 创建多分支: - 执行命令 `git branch branch1` 创建一个名为 branch1 的分支。 - 执行命令 `git branch branch2` 创建一个名为 branch2 的分支。 - 执行命令 `git branch` 查看所有分支,确认分支创建成功。 2. 切换到不同分支提交不同文件版本: - 执行命令 `git checkout branch1` 切换到 branch1 分支。 - 在该分支下进行一些修改,并执行命令 `git add .` 和 `git commit -m "Commit on branch1"` 提交修改。 - 执行命令 `git checkout branch2` 切换到 branch2 分支。 - 在该分支下进行一些不同的修改,并执行命令 `git add .` 和 `git commit -m "Commit on branch2"` 提交修改。 3. 产生分支冲突: - 在同一个文件的相同位置,在 branch1 和 branch2 分支上进行不同的修改。 - 执行命令 `git checkout branch1` 切换到 branch1 分支。 - 执行命令 `git merge branch2` 尝试将 branch2 分支合并到 branch1 分支。此时会产生冲突。 4. 解决冲突: - 打开冲突文件,手动解决冲突,删除不需要的代码并保留需要的代码。 - 执行命令 `git add .` 将解决后的文件标记为已解决。 - 执行命令 `git commit -m "Resolve conflicts"` 提交解决后的文件。 请记住,在实际操作中,应该在合适的时间进行提交和推送,以确保分支提交的文件版本正确。 希望以上步骤对你有所帮助!如果你有其他问题,可以继续提问。
评论 1
添加红包

请填写红包祝福语或标题

红包个数最小为10个

红包金额最低5元

当前余额3.43前往充值 >
需支付:10.00
成就一亿技术人!
领取后你会自动成为博主和红包主的粉丝 规则
hope_wisdom
发出的红包
实付
使用余额支付
点击重新获取
扫码支付
钱包余额 0

抵扣说明:

1.余额是钱包充值的虚拟货币,按照1:1的比例进行支付金额的抵扣。
2.余额无法直接购买下载,可以购买VIP、付费专栏及课程。

余额充值