github fork的代码如何与原仓库保持一致

ityunqing@wang MINGW64 /f/java4all/fork/fescar (master)
$ git branch
* master

ityunqing@wang MINGW64 /f/java4all/fork/fescar (master)
$ git remote -v
origin  git@github.com:lightClouds917/fescar.git (fetch)
origin  git@github.com:lightClouds917/fescar.git (push)

ityunqing@wang MINGW64 /f/java4all/fork/fescar (master)
$ git remote add upstream git@github.com:seata/seata.git

ityunqing@wang MINGW64 /f/java4all/fork/fescar (master)
$ git remote -v
origin  git@github.com:lightClouds917/fescar.git (fetch)
origin  git@github.com:lightClouds917/fescar.git (push)
upstream        git@github.com:seata/seata.git (fetch)
upstream        git@github.com:seata/seata.git (push)

ityunqing@wang MINGW64 /f/java4all/fork/fescar (master)
$ git fetch upstream
remote: Enumerating objects: 1596, done.
remote: Counting objects: 100% (1596/1596), done.
remote: Compressing objects: 100% (7/7), done.
remote: Total 13231 (delta 1586), reused 1593 (delta 1586), pack-reused 11635
Receiving objects: 100% (13231/13231), 2.26 MiB | 917.00 KiB/s, done.
Resolving deltas: 100% (5545/5545), completed with 215 local objects.
From github.com:seata/seata
 * [new branch]      0.5.0      -> upstream/0.5.0
 * [new branch]      0.5.1      -> upstream/0.5.1
 * [new branch]      0.5.2      -> upstream/0.5.2
 * [new branch]      0.6.0      -> upstream/0.6.0
 * [new branch]      0.6.1      -> upstream/0.6.1
 * [new branch]      0.7.0      -> upstream/0.7.0
 * [new branch]      0.7.1      -> upstream/0.7.1
 * [new branch]      at_plugin  -> upstream/at_plugin
 * [new branch]      develop    -> upstream/develop
 * [new branch]      feature_spring_support -> upstream/feature_spring_support
 * [new branch]      master     -> upstream/master
 * [new tag]         v0.7.1     -> v0.7.1
 * [new tag]         v0.1.4     -> v0.1.4
 * [new tag]         v0.5.1     -> v0.5.1
 * [new tag]         v0.5.2     -> v0.5.2
 * [new tag]         v0.6.0     -> v0.6.0
 * [new tag]         v0.6.1     -> v0.6.1
 * [new tag]         v0.7.0     -> v0.7.0

ityunqing@wang MINGW64 /f/java4all/fork/fescar (master)
$ git branch
* master

ityunqing@wang MINGW64 /f/java4all/fork/fescar (master)
$ git merge upstream/master
Updating 8f7795e..39e4d89
Checking out files: 100% (1197/1197), done.
Fast-forward
 .github/ISSUE_TEMPLATE/BUG_REPORT.md               |   38 +
 .github/ISSUE_TEMPLATE/FEATURE_REQUEST.md          |   16 +
 .github/PULL_REQUEST_TEMPLATE.md                   |   17 +
 .gitignore                                         |   47 +-
 .mvn/wrapper/maven-wrapper.jar                     |  Bin 0 -> 47774 bytes
 .mvn/wrapper/maven-wrapper.properties              |    1 +
 .travis.yml                                        |   18 +
 CHANGELOG.md                                       |    2 +-
 CODE_OF_CONDUCT.md                                 |   76 ++
 CONTRIBUTING.md                                    |  195 +++
 README.md                                          |   87 +-
 all/pom.xml                                        |  623 ++++++++++
 bom/pom.xml                                        |  464 ++++++++
 changeVersion.sh                                   |    5 +
 codec/pom.xml                                      |   36 +
 codec/seata-codec-all/pom.xml                      |   40 +
 codec/seata-codec-protobuf/pom.xml                 |   41 +
 .../io/seata/codec/protobuf/ProtobufCodec.java     |   82 ++
 .../io/seata/codec/protobuf/ProtobufHelper.java    |   88 ++
 .../seata/codec/protobuf/ProtobufSerializer.java   |   93 ++

 codecov.yml                                        |   12 +
 common/pom.xml                                     |   16 +-
 .../java/com/alibaba/fescar/common/Constants.java  |   33 -

 1197 files changed, 109093 insertions(+), 25891 deletions(-)
 create mode 100644 .github/ISSUE_TEMPLATE/BUG_REPORT.md
 ......省略几千行......
 create mode 100644 tm/src/test/java/io/seata/tm/api/transaction/TransactionHookManagerTest.java
 create mode 100644 tm/src/test/java/io/seata/tm/api/transaction/TransactionInfoTest.java

ityunqing@wang MINGW64 /f/java4all/fork/fescar (master)
$ git push
Counting objects: 13157, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (4473/4473), done.
Writing objects: 100% (13157/13157), 2.21 MiB | 1.02 MiB/s, done.
Total 13157 (delta 5436), reused 12659 (delta 5037)
remote: Resolving deltas: 100% (5436/5436), completed with 45 local objects.
To github.com:lightClouds917/fescar.git
   8f7795e..39e4d89  master -> master

ityunqing@wang MINGW64 /f/java4all/fork/fescar (master)