Brick 4 Assessment

Yesterday, I was greedy and did not make any moves. I gave myself an excuse.

I heard that today's assessment is about to take a short time, but git has been reading it for nearly a week. I think it should also be despised, NC, alas.

I do not complain, I do not complain, I move more bricks.

I sorted out the process and got familiar with it again.

I. preparation phase
Yum install Git-core
Git config -- global user. Name 'admin'
Git config -- global user. Email admin@gmail.com
Ssh-keygen-T RSA
Vim ~ /. Ssh/config

2. merge branches
Git clone git @ gitserver: Test. Git
CD Test
Git branch Admin

Git checkout Admin
Git Branch
Git branch-
Vim Test
Git diff
Git status
Git add Test
Git commit-m'test for exercise'
Git push origin admin: Admin
Git log
Git checkout master
Vim Test
Git pull origin Admin

Equivalent:
Git fetch Origin
Git merge Admin
Vim Test

3. Patch
[Programmer stage]
Git branch you
Git checkout you
VI patching. c
Git add patching. c
Git commit-M 'my patching'
Git format-patch-M Master
Cat 0001-patching.patch
Git checkout master
Git add 0001-patching.patch
Git commit-M 'my patching'
Git pull
Git push
[Manager stage]
Git pull
Git Branch New
Git am-Abort
Git am 0001-patching.patch
Git checkout master
Git merge new
VI patching. c

Do not patch this, refer to the summary of Senior brother and sister.

Don't create negative emotions, live a positive life, don't rush, take it slowly. Move bricks and tiles step by step. Good luck. You have to do it yourself.