[root@hostname git_test]# git init

hint: Using 'master' as the name for the initial branch. This default branch name

hint: is subject to change. To configure the initial branch name to use in all

hint: of your new repositories, which will suppress this warning, call:

hint:

hint: git config --global init.defaultBranch <name>

hint:

hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and

hint: 'development'. The just-created branch can be renamed via this command:

hint:

hint: git branch -m <name>

Initialized empty Git repository in /root/git_test/.git/

[root@hostname git_test]# git log

fatal: your current branch 'master' does not have any commits yet

[root@hostname git_test]# vi test.txt

[root@hostname git_test]# git add .

[root@hostname git_test]# git commit "in main, 1st change"

error: pathspec 'in main, 1st change' did not match any file(s) known to git

[root@hostname git_test]# git commit -m "in main, 1st change"

[master (root-commit) 5c0420f] in main, 1st change

1 file changed, 1 insertion(+)

create mode 100644 test.txt

[root@hostname git_test]# git commit "in main, 1st change"^C

[root@hostname git_test]# vi test.txt

[root@hostname git_test]# git add .

[root@hostname git_test]# git commit -m "in main, 2nd change"

[master 16e9a53] in main, 2nd change

1 file changed, 1 insertion(+)

[root@hostname git_test]# gi tlog

bash: gi: command not found...

Similar command is: 'go'

[root@hostname git_test]# git log

commit 16e9a53302c804d3a0ad7924c45e00209c86c72f (HEAD -> master)

Author: Shuai Ma <shuai.ma@hei-ya.com>

Date: Fri Apr 21 22:41:49 2023 -0400

in main, 2nd change

commit 5c0420f6c5efb9c8b98c89b9d4595f15c3fbed9c

Author: Shuai Ma <shuai.ma@hei-ya.com>

Date: Fri Apr 21 22:41:23 2023 -0400

in main, 1st change

[root@hostname git_test]# git checkout -b feature_1

Switched to a new branch 'feature_1'

[root@hostname git_test]# vi test.txt

[root@hostname git_test]# git add .

[root@hostname git_test]# git commit -m "after branching, in feature_1, 1st change"

[feature_1 11981bf] after branching, in feature_1, 1st change

1 file changed, 1 insertion(+)

[root@hostname git_test]# git checkout master

Switched to branch 'master'

[root@hostname git_test]# vi test.txt

[root@hostname git_test]# git add .

[root@hostname git_test]# git commit -m "after branching, in main, 1st change"

[master 129c297] after branching, in main, 1st change

1 file changed, 1 insertion(+)

[root@hostname git_test]# vi test.txt

[root@hostname git_test]# git add .

[root@hostname git_test]# git commit -m "after branching, in main, 2nd change"

[master 87d7da3] after branching, in main, 2nd change

1 file changed, 1 insertion(+)

[root@hostname git_test]# git checkout feature_1

Switched to branch 'feature_1'

[root@hostname git_test]# vi test.txt

[root@hostname git_test]# git add .

[root@hostname git_test]# git commit -m "after branching, in feature_1, 2nd change"

[feature_1 c170207] after branching, in feature_1, 2nd change

1 file changed, 1 insertion(+)

[root@hostname git_test]# git log

commit c170207b0567946eff71880ee90326ad64822b0b (HEAD -> feature_1)

Author: Shuai Ma <shuai.ma@hei-ya.com>

Date: Fri Apr 21 22:46:46 2023 -0400

after branching, in feature_1, 2nd change

commit 11981bffedb873679d73bdca89716f1b6cbc9f4d

Author: Shuai Ma <shuai.ma@hei-ya.com>

Date: Fri Apr 21 22:42:58 2023 -0400

after branching, in feature_1, 1st change

commit 16e9a53302c804d3a0ad7924c45e00209c86c72f

Author: Shuai Ma <shuai.ma@hei-ya.com>

Date: Fri Apr 21 22:41:49 2023 -0400

in main, 2nd change

commit 5c0420f6c5efb9c8b98c89b9d4595f15c3fbed9c

Author: Shuai Ma <shuai.ma@hei-ya.com>

Date: Fri Apr 21 22:41:23 2023 -0400

in main, 1st change

[root@hostname git_test]# git checkout master

Switched to branch 'master'

[root@hostname git_test]# vi test.txt

[root@hostname git_test]# git add .

[root@hostname git_test]# git commit -m "after branching, in main, 3rd change"

[master 687068c] after branching, in main, 3rd change

1 file changed, 1 insertion(+)

[root@hostname git_test]# git log

commit 687068ce78e7f72326ecaec4c4d062139cd4d2c3 (HEAD -> master)

Author: Shuai Ma <shuai.ma@hei-ya.com>

Date: Fri Apr 21 22:48:29 2023 -0400

after branching, in main, 3rd change

commit 87d7da3f4a51f811a846451bb75f7f8ccbd7cca0

Author: Shuai Ma <shuai.ma@hei-ya.com>

Date: Fri Apr 21 22:44:23 2023 -0400

after branching, in main, 2nd change

commit 129c297f2ac32868f60a6cee4fc76970090648ab

Author: Shuai Ma <shuai.ma@hei-ya.com>

Date: Fri Apr 21 22:43:46 2023 -0400

after branching, in main, 1st change

commit 16e9a53302c804d3a0ad7924c45e00209c86c72f

Author: Shuai Ma <shuai.ma@hei-ya.com>

Date: Fri Apr 21 22:41:49 2023 -0400

in main, 2nd change

commit 5c0420f6c5efb9c8b98c89b9d4595f15c3fbed9c

Author: Shuai Ma <shuai.ma@hei-ya.com>

Date: Fri Apr 21 22:41:23 2023 -0400

in main, 1st change

[root@hostname git_test]# git checkout feature_1

Switched to branch 'feature_1'

[root@hostname git_test]# git log

commit c170207b0567946eff71880ee90326ad64822b0b (HEAD -> feature_1)

Author: Shuai Ma <shuai.ma@hei-ya.com>

Date: Fri Apr 21 22:46:46 2023 -0400

after branching, in feature_1, 2nd change

commit 11981bffedb873679d73bdca89716f1b6cbc9f4d

Author: Shuai Ma <shuai.ma@hei-ya.com>

Date: Fri Apr 21 22:42:58 2023 -0400

after branching, in feature_1, 1st change

commit 16e9a53302c804d3a0ad7924c45e00209c86c72f

Author: Shuai Ma <shuai.ma@hei-ya.com>

Date: Fri Apr 21 22:41:49 2023 -0400

in main, 2nd change

commit 5c0420f6c5efb9c8b98c89b9d4595f15c3fbed9c

Author: Shuai Ma <shuai.ma@hei-ya.com>

Date: Fri Apr 21 22:41:23 2023 -0400

in main, 1st change

[root@hostname git_test]# git merge master

Auto-merging test.txt

CONFLICT (content): Merge conflict in test.txt

Automatic merge failed; fix conflicts and then commit the result.

[root@hostname git_test]# vi test.txt

[root@hostname git_test]# git status

On branch feature_1

You have unmerged paths.

(fix conflicts and run "git commit")

(use "git merge --abort" to abort the merge)

Unmerged paths:

(use "git add <file>..." to mark resolution)

both modified: test.txt

no changes added to commit (use "git add" and/or "git commit -a")

[root@hostname git_test]# git add .

[root@hostname git_test]# git commit -m "merge main, fix conflict"

[feature_1 ed8959d] merge main, fix conflict

git log shows all the commits from master branch and feature_1 branch are included

[root@hostname git_test]# git log

commit ed8959dd5f7c200c9e45e69a1804ecb83b3cf89e (HEAD -> feature_1)

Merge: c170207 687068c

Author: Shuai Ma <shuai.ma@hei-ya.com>

Date: Fri Apr 21 22:54:42 2023 -0400

merge main, fix conflict

commit 687068ce78e7f72326ecaec4c4d062139cd4d2c3 (master)

Author: Shuai Ma <shuai.ma@hei-ya.com>

Date: Fri Apr 21 22:48:29 2023 -0400

after branching, in main, 3rd change

commit c170207b0567946eff71880ee90326ad64822b0b

Author: Shuai Ma <shuai.ma@hei-ya.com>

Date: Fri Apr 21 22:46:46 2023 -0400

after branching, in feature_1, 2nd change

commit 87d7da3f4a51f811a846451bb75f7f8ccbd7cca0

Author: Shuai Ma <shuai.ma@hei-ya.com>

Date: Fri Apr 21 22:44:23 2023 -0400

after branching, in main, 2nd change

commit 129c297f2ac32868f60a6cee4fc76970090648ab

Author: Shuai Ma <shuai.ma@hei-ya.com>

Date: Fri Apr 21 22:43:46 2023 -0400

after branching, in main, 1st change

commit 11981bffedb873679d73bdca89716f1b6cbc9f4d

Author: Shuai Ma <shuai.ma@hei-ya.com>

Date: Fri Apr 21 22:42:58 2023 -0400

after branching, in feature_1, 1st change

commit 16e9a53302c804d3a0ad7924c45e00209c86c72f

Author: Shuai Ma <shuai.ma@hei-ya.com>

Date: Fri Apr 21 22:41:49 2023 -0400

in main, 2nd change

commit 5c0420f6c5efb9c8b98c89b9d4595f15c3fbed9c

Author: Shuai Ma <shuai.ma@hei-ya.com>

Date: Fri Apr 21 22:41:23 2023 -0400

in main, 1st change

[root@hostname git_test]# git diff 11981bffedb873679d73bdca89716f1b6cbc9f4d 129c297f2ac32868f60a6cee4fc76970090648ab

diff --git a/test.txt b/test.txt

index 0681d7f..4e4c571 100644

--- a/test.txt

+++ b/test.txt

@@ -1,3 +1,3 @@

in main, 1st change

in main, 2nd change

-after branching, in feature_1, 1st change

+after branching, in main, 1st change

[root@hostname git_test]# git diff 11981bffedb873679d73bdca89716f1b6cbc9f4d 129c297f2ac32868f60a6cee4fc76970090648ab

diff --git a/test.txt b/test.txt

index 0681d7f..4e4c571 100644

--- a/test.txt

+++ b/test.txt

@@ -1,3 +1,3 @@

in main, 1st change

in main, 2nd change

-after branching, in feature_1, 1st change

+after branching, in main, 1st change

[root@hostname git_test]# git rebase -i 16e9a53302c804d3a0ad7924c45e00209c86c72f

[detached HEAD d2b1d01] after branching, in feature_1, 1st change

Date: Fri Apr 21 22:42:58 2023 -0400

1 file changed, 2 insertions(+)

Auto-merging test.txt

CONFLICT (content): Merge conflict in test.txt

error: could not apply 129c297... after branching, in main, 1st change

Resolve all conflicts manually, mark them as resolved with

"git add/rm <conflicted_files>", then run "git rebase --continue".

You can instead skip this commit: run "git rebase --skip".

To abort and get back to the state before "git rebase", run "git rebase --abort".

Could not apply 129c297... after branching, in main, 1st change

in the pop up file:

pick 11981bf after branching, in feature_1, 1st change

s c170207 after branching, in feature_1, 2nd change

pick 129c297 after branching, in main, 1st change

pick 87d7da3 after branching, in main, 2nd change

pick 687068c after branching, in main, 3rd change

# Rebase 16e9a53..ed8959d onto 16e9a53 (5 commands)

#

# Commands:

# p, pick <commit> = use commit

# r, reword <commit> = use commit, but edit the commit message

# e, edit <commit> = use commit, but stop for amending

# s, squash <commit> = use commit, but meld into previous commit

# f, fixup <commit> = like "squash", but discard this commit's log message

# x, exec <command> = run command (the rest of the line) using shell

# b, break = stop here (continue rebase later with 'git rebase --continue')

# d, drop <commit> = remove commit

# l, label <label> = label current HEAD with a name

# t, reset <label> = reset HEAD to a label

# m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]

# . create a merge commit using the original merge commit's

# . message (or the oneline, if no original merge commit was

# . specified). Use -c <commit> to reword the commit message.

#

# These lines can be re-ordered; they are executed from top to bottom.

#

# If you remove a line here THAT COMMIT WILL BE LOST.

#

# However, if you remove everything, the rebase will be aborted.

Conflict:

[root@hostname git_test]# vi test.txt

in main, 1st change

in main, 2nd change

<<<<<<< HEAD

after branching, in feature_1, 1st change

after branching, in feature_1, 2nd change

=======

after branching, in main, 1st change

>>>>>>> 129c297 (after branching, in main, 1st change)

[root@hostname git_test]# git add .

[root@hostname git_test]# git rebase --continue

[detached HEAD d1ac649] after branching, in main, 1st change

1 file changed, 1 insertion(+)

Successfully rebased and updated refs/heads/feature_1.

再次git log, 发现merge 那次记录没有了？

[root@hostname git_test]# git log

commit 4c6b9d68e4312a61e36f4bb95cad64f080d11d13 (HEAD -> feature_1)

Author: Shuai Ma <shuai.ma@hei-ya.com>

Date: Fri Apr 21 22:48:29 2023 -0400

after branching, in main, 3rd change

commit fb2d8d2de1a02a1c3d930ec68f20ea6955cd6f8a

Author: Shuai Ma <shuai.ma@hei-ya.com>

Date: Fri Apr 21 22:44:23 2023 -0400

after branching, in main, 2nd change

commit d1ac6493ba37454002009bf92a83363220a68e09

Author: Shuai Ma <shuai.ma@hei-ya.com>

Date: Fri Apr 21 22:43:46 2023 -0400

after branching, in main, 1st change

commit d2b1d01d56705e26cc23a819c23e7a3d48c38104

Author: Shuai Ma <shuai.ma@hei-ya.com>

Date: Fri Apr 21 22:42:58 2023 -0400

after branching, in feature_1, 1st change

after branching, in feature_1, 2nd change

commit 16e9a53302c804d3a0ad7924c45e00209c86c72f

Author: Shuai Ma <shuai.ma@hei-ya.com>

Date: Fri Apr 21 22:41:49 2023 -0400

in main, 2nd change

commit 5c0420f6c5efb9c8b98c89b9d4595f15c3fbed9c

Author: Shuai Ma <shuai.ma@hei-ya.com>

Date: Fri Apr 21 22:41:23 2023 -0400

in main, 1st change

[root@hostname git_test]# git diff 16e9a53302c804d3a0ad7924c45e00209c86c72f d2b1d01d56705e26cc23a819c23e7a3d48c38104

diff --git a/test.txt b/test.txt

index ff7d9a6..0a69e58 100644

--- a/test.txt

+++ b/test.txt

@@ -1,2 +1,4 @@

in main, 1st change

in main, 2nd change

+after branching, in feature_1, 1st change

+after branching, in feature_1, 2nd change

[root@hostname git_test]# git diff d2b1d01d56705e26cc23a819c23e7a3d48c38104 d1ac6493ba37454002009bf92a83363220a68e09

diff --git a/test.txt b/test.txt

index 0a69e58..3469806 100644

--- a/test.txt

+++ b/test.txt

@@ -2,3 +2,4 @@ in main, 1st change

in main, 2nd change

after branching, in feature_1, 1st change

after branching, in feature_1, 2nd change

+after branching, in main, 1st change

[root@hostname git_test]#



												


											
git merge 详细操作，看完就懂的更多相关文章
	

    
						
  1. 深度剖析HashMap的数据存储实现原理（看完必懂篇）
		
    深度剖析HashMap的数据存储实现原理(看完必懂篇) 具体的原理分析可以参考一下两篇文章,有透彻的分析! 参考资料: 1. https://www.jianshu.com/p/17177c12f84 ...
    
		
    2. 
						
  2. [转帖]Linux shell中2>&1的含义解释 （全网最全，看完就懂）
		
    Linux shell中2>&1的含义解释 (全网最全,看完就懂) https://blog.csdn.net/zhaominpro/article/details/82630528   ...
    
		
    3. 
						
  3. 2018前端面试总结，看完弄懂，工资少说加3K | 掘金技术征文
		
    2018前端面试总结,看完弄懂,工资少说加3K | 掘金技术征文:https://juejin.im/post/5b94d8965188255c5a0cdc02
    
		
    4. 
						
  4. git版本控制-详细操作
		
    - git,软件帮助使用者进行版本的管理 阶段一git 命令: git init 初始化 git config --global user.email "you@example.com&qu ...
    
		
    5. 
						
  5. 最全的前端Git基础命令，看完保证你会！
		
    常见信息 master: 默认开发分支 origin:默认远程版本库 Head: 默认开发分支 Head^:Head 的父提交 创建新仓库 git init git init [project-nam ...
    
		
    6. 
						
  6. java回调函数，看完就懂
		
    java回调函数在网上了看了些例子,比较绕,不够清晰,自己写的一个例子比较通俗,java回调其实很简单. 举个例子我是类B,我有个方法叫b(),现在我要调用类A中的方法a(),写个代码就是: publ ...
    
		
    7. 
						
  7. 看完肯定懂的 Java 字符串常量池指南
		
    字符串问题可谓是 Java 中经久不衰的问题,尤其是字符串常量池经常作为面试题出现.可即便是看似简单而又经常被提起的问题,还是有好多同学一知半解,看上去懂了,仔细分析起来却又发现不太明白. 背景说明  ...
    
		
    8. 
						
  8. 如何利用tox打造自动自动化测试框架，看完就懂
		
    什么是toxtox官方文档的第一句话 standardize testing in Python,意思就是说标准化python中的测试,那是不是很适合测试人员来使用呢,我们来看看他究竟是什么? 根据官 ...
    
		
    9. 
						
  9. 看完就懂--CSS选择器优先级的计算
		
    CSS选择器优先级的计算 什么是选择器的优先级 优先级的计算与比较(一) - 优先级具有可加性 - 选择器优先级不会超过自身最大数量级 - 同等优先级情况下,后写的覆盖前写的 - 并集选择器之间的优先 ...
    
		
    10. 
						
  10. NB-IoT的DRX、eDRX、PSM三个模式怎么用？通俗解释，看完就懂！
		
    面我们讲了不少NB-IOT的应用.软件和硬件设计的变动. (链接在文章末尾). 今天讲讲NB-IoT的三大模式,在各种物联网和智能硬件场景中的使用方法 DRX.eDRx.PSM是什么? DRX虽然叫做 ...
    
		
    11. 
		

	


随机推荐
	

    
									
  1. 使用bootstrap-select 动态加载数据不显示的问题，级联数据置为空
			
    动态加载数据 $.showLoading('数据加载中');//开启遮挡层 $.ajax({ url: "/PickoutStock/GetSendReceive", data:  ...
    
			
    2. 
						
  2. 通俗讲解promise
			
        JavaScript 中的 Promise 是一种特殊的对象,它用于解决异步编程中的复杂性问题,特别是回调的问题.我们可以把它比喻成现实生活中的一个"承诺": 想象一下,你 ...
    
			
    3. 
						
  3. 一款开源免费功能强大的一站式自动化运维及自动化部署平台orion-ops
			
    一站式自动化运维及自动化部署平台, 使用多环境的概念, 提供了机器管理.机器监控报警.Web终端.WebSftp.机器批量执行.机器批量上传.在线查看日志.定时调度任务.应用环境维护.应用构建及发布任 ...
    
			
    4. 
						
  4. GUN/Linux 基础教程
			
    GUN/Linux 基础教程 控制台 shell 超级用户 root 辅助管理 CLI 软件 文件基础 目录 链接 设备文件 控制台 shell 在启动 Linux 系统后,如果没有安装 GUI 的话 ...
    
			
    5. 
						
  5. CF1915B Not Quite Latin Square 题解
			
    CF1915B 题意 给出一个 \(3\) 行 \(3\) 列的字符矩形,其中每行都有字符 ABC 各一个组成,现有一个字符未知,求出未知字符. 思路 就是说每个字符都应该出现 \(3\) 次,所以我 ...
    
			
    6. 
						
  6. 单细胞测序最好的教程（十四）测序原始数据公开至NCBI数据库
			
    作者按 国内对于单细胞测序相关的中文教程确实不够全面,当然NCBI官网给的上传教程也比较详细了,所以变成了会者不难.本教程你现在可能用不上,但是你如果做单细胞测序,那么未来你一定会用上,建议收藏. 在 ...
    
			
    7. 
						
  7. os.popen(cmd) 与 os.system(cmd) 的区别
			
    os.popen(cmd) 与 os.system(cmd) 的区别 1,os.popen(cmd) 不会直接返回任何数据,os.system(cmd) 会直接输出结果(返回的却是int状态码) 2, ...
    
			
    8. 
						
  8. python实例化对象过程
			
    python实例化对象过程 Python中存在着一种静态的__new__()方法,通常在定义类时不会重写__new__()方法,于是Python在调用类时会自动寻找该类的继承对象(本例中为Object ...
    
			
    9. 
						
  9. Python和RPA网页自动化-让非标准下拉框选择指定文本的方法
			
    以下方"节点审批"下拉框为例 该下拉框没有<select>标签,而是<div><ul><li>标签.分别使用Python和RPA网页 ...
    
			
    10. 
						
  10. Jmeter函数助手29-dateTimeConvert
			
    dateTimeConvert函数用于将源格式进行目标格式的转换. 格式化时间:传入时间参数,此处格式需要与源时间格式一致 源时间格式:传入参数的时间格式 目标时间格式:想要转换成的格式 1.将源格式 ...
    
			
    11.