github上fork分支后再合入原master分支的改动

　　几个月前看到一个电商项目，文档比较全，fork下来学习下。后来因为其他事情耽搁了，现在想重新看看，发现改动比较大，master分支跟我fork下来的分支不一样了。咋办？简单，把最新的master分支下到本地，把改动merge到本地fork分支后，提交到fork分支。先搞清楚原git链接(https://github.com/macrozheng/mall.git)和本地fork下来后的git链接(https://github.com/wuxun1997/mall.git)，下面开始操作：

wulf@wulf00 MINGW64 /e/workspace/mall (master)
$ git remote add upstream https://github.com/macrozheng/mall.git

wulf@wulf00 MINGW64 /e/workspace/mall (master)
$ git fetch upstream
remote: Enumerating objects: 302, done.
remote: Counting objects: 100% (302/302), done.
remote: Compressing objects: 100% (26/26), done.
Receivinremote: Total 534 (delta 269), reused 300 (delta 268), pack-reused 232
Receiving objects: 100% (534/534), 1.21 MiB | 541.00 KiB/s, done.
Resolving deltas: 100% (314/314), completed with 90 local objects.
From https://github.com/macrozheng/mall
 * [new branch]      master     -> upstream/master

wulf@wulf00 MINGW64 /e/workspace/mall (master)
$ git merge upstream/master
Updating 79000a1..dc14ed5
Fast-forward
 README.md                                          | 147 ++++++--------
 document/docker/docker-compose-app.yml             |  27 +++
 document/docker/docker-compose-env.yml             |  71 +++++++
 document/docker/docker-compose.yml                 |  62 ------
 document/docker/host.txt                           |   7 -
 document/docker/nginx.conf                         |  45 +++++
 document/elk/elk.md                                |  21 --
 document/elk/logstash-springboot.conf              |  18 +-
 .../mind/app.emmx                                  | Bin
 document/mind/cms.emmx                             | Bin 0 -> 23013 bytes
 .../mind/home.emmx                                 | Bin
 document/mind/oms.emmx                             | Bin 0 -> 32155 bytes
 document/mind/pms.emmx                             | Bin 0 -> 33382 bytes
 document/mind/sms.emmx                             | Bin 0 -> 23995 bytes
 document/mind/ums.emmx                             | Bin 0 -> 29455 bytes
 "document/mind/\344\277\203\351\224\200.emmx"      | Bin 21946 -> 0 bytes
 "document/mind/\345\206\205\345\256\271.emmx"      | Bin 21799 -> 0 bytes
 "document/mind/\345\225\206\345\223\201.emmx"      | Bin 30707 -> 0 bytes
 "document/mind/\347\224\250\346\210\267.emmx"      | Bin 24768 -> 0 bytes
 "document/mind/\350\256\242\345\215\225.emmx"      | Bin 28712 -> 0 bytes
 ...12\241\346\236\266\346\236\204\345\233\276.pos" |   1 +
 ...73\237\346\236\266\346\236\204\345\233\276.pos" |   1 +
 ...17\221\350\277\233\345\272\246\345\233\276.pos" |   1 +
 README-DEV.md => document/reference/dev_flow.md    |  72 ++-----
 document/resource/mall_dev_flow.png                | Bin 78530 -> 25026 bytes
 document/resource/mall_dev_flow_note.png           | Bin 106915 -> 47200 bytes
 document/resource/mind_content.jpg                 | Bin 482497 -> 128731 bytes
 document/resource/mind_member.jpg                  | Bin 709858 -> 190172 bytes
 document/resource/mind_order.jpg                   | Bin 895441 -> 238342 bytes
 document/resource/mind_portal.jpg                  | Bin 716306 -> 187839 bytes
 document/resource/mind_product.jpg                 | Bin 892488 -> 231246 bytes
 document/resource/mind_sale.jpg                    | Bin 543641 -> 143697 bytes
 document/sql/mall.sql                              |   2 +-
 mall-admin/pom.