Post

21 Merging

Posted
By EthanWang
1 min read
21 Merging

Command:

1

$ git branch

Code output:

1
2
3

  Even-better-feature

* master

Command:

1

$ git merge even-better-feature

Code output:

1
2
3
4
5
6
7
8
9

Updating 7d1de19..4361880

Fast-forward

  free-memory.py | 6 ++++++

  1 file changed, 6 insertions (+)

  Create mode 100644 free_memory.py

Command:

1

$ git log

Code output:

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27

Switched to branch 'master'

commit 436188012f633b773eb6034fc02051e34da05134 (HEAD -> master, even-better-feature)

Author: artwalker <artwalker@example.com>

Date:   Mon Jan 6 09:47:07 2020 -0800 

     Add an empty free_memory.py

commit 7d7167b2db44abf8cf014230f9b9708786e41c2a

Author: artwalker <artwalker@example.com>

Date:   Mon Jan 6 09:15:58 2020 -0800 

    Revert "New name for disk_usage.py"

    

    Rollback reason: the previous name was actually better :)

    

    This reverts commit 7d7167b2db44abf8cf014230f9b9708786e41c2a.

(...)
Git&&GitHub
git github
This post is licensed under CC BY 4.0 by the author.