当前位置: 首页 > 工具软件 > Fork CMS > 使用案例 >

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

邢修明
2023-12-01

  几个月前看到一个电商项目,文档比较全,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.xml                                 |  18 +-
 .../com/macro/mall/component/WebLogAspect.java     |  11 +-
 .../com/macro/mall/config/GlobalCorsConfig.java    |  34 ++++
 .../java/com/macro/mall/config/SecurityConfig.java |  24 +--
 .../macro/mall/controller/UmsAdminController.java  |  19 ++
 .../mall/dto/SmsFlashPromotionSessionDetail.java   |   2 +-
 .../macro/mall/dto/UpdateAdminPasswordParam.java   |  21 ++
 .../SmsFlashPromotionProductRelationService.java   |   2 +-
 .../com/macro/mall/service/UmsAdminService.java    |   6 +
 ...msFlashPromotionProductRelationServiceImpl.java |   2 +-
 .../impl/SmsFlashPromotionSessionServiceImpl.java  |   2 +-
 .../mall/service/impl/UmsAdminServiceImpl.java     |  25 +++
 mall-common/pom.xml                                |  22 +-
 mall-demo/.mvn/wrapper/maven-wrapper.jar           | Bin 47610 -> 0 bytes
 mall-demo/.mvn/wrapper/maven-wrapper.properties    |   1 -
 mall-demo/mvnw                                     | 225 ---------------------
 mall-demo/mvnw.cmd                                 | 143 -------------
 mall-demo/pom.xml                                  |   5 +-
 .../macro/mall/{ => demo}/MallDemoApplication.java |   2 +-
 .../macro/mall/demo/controller/DemoController.java |   4 +-
 .../controller/RestTemplateDemoController.java     |   2 +-
 mall-mbg/pom.xml                                   |  17 +-
 .../macro/mall/mapper/CmsHelpCategoryMapper.java   |   2 +-
 .../java/com/macro/mall/mapper/CmsHelpMapper.java  |   2 +-
 .../macro/mall/mapper/CmsMemberReportMapper.java   |   2 +-
 .../macro/mall/mapper/CmsPrefrenceAreaMapper.java  |   2 +-
 .../CmsPrefrenceAreaProductRelationMapper.java     |   2 +-
 .../mall/mapper/CmsSubjectCategoryMapper.java      |   2 +-
 .../macro/mall/mapper/CmsSubjectCommentMapper.java |   2 +-
 .../com/macro/mall/mapper/CmsSubjectMapper.java    |   2 +-
 .../mapper/CmsSubjectProductRelationMapper.java    |   2 +-
 .../macro/mall/mapper/CmsTopicCategoryMapper.java  |   2 +-
 .../macro/mall/mapper/CmsTopicCommentMapper.java   |   2 +-
 .../java/com/macro/mall/mapper/CmsTopicMapper.java |   2 +-
 .../com/macro/mall/mapper/OmsCartItemMapper.java   |   2 +-
 .../macro/mall/mapper/OmsCompanyAddressMapper.java |   2 +-
 .../com/macro/mall/mapper/OmsOrderItemMapper.java  |   2 +-
 .../java/com/macro/mall/mapper/OmsOrderMapper.java |   2 +-
 .../mall/mapper/OmsOrderOperateHistoryMapper.java  |   2 +-
 .../mall/mapper/OmsOrderReturnApplyMapper.java     |   2 +-
 .../mall/mapper/OmsOrderReturnReasonMapper.java    |   2 +-
 .../macro/mall/mapper/OmsOrderSettingMapper.java   |   2 +-
 .../java/com/macro/mall/mapper/PmsAlbumMapper.java |   2 +-
 .../com/macro/mall/mapper/PmsAlbumPicMapper.java   |   2 +-
 .../java/com/macro/mall/mapper/PmsBrandMapper.java |   2 +-
 .../com/macro/mall/mapper/PmsCommentMapper.java    |   2 +-
 .../macro/mall/mapper/PmsCommentReplayMapper.java  |   2 +-
 .../macro/mall/mapper/PmsFeightTemplateMapper.java |   2 +-
 .../macro/mall/mapper/PmsMemberPriceMapper.java    |   2 +-
 .../mapper/PmsProductAttributeCategoryMapper.java  |   2 +-
 .../mall/mapper/PmsProductAttributeMapper.java     |   2 +-
 .../mapper/PmsProductAttributeValueMapper.java     |   2 +-
 .../PmsProductCategoryAttributeRelationMapper.java |   2 +-
 .../mall/mapper/PmsProductCategoryMapper.java      |   2 +-
 .../mall/mapper/PmsProductFullReductionMapper.java |   2 +-
 .../macro/mall/mapper/PmsProductLadderMapper.java  |   2 +-
 .../com/macro/mall/mapper/PmsProductMapper.java    |   2 +-
 .../mall/mapper/PmsProductOperateLogMapper.java    |   2 +-
 .../mall/mapper/PmsProductVertifyRecordMapper.java |   2 +-
 .../com/macro/mall/mapper/PmsSkuStockMapper.java   |   2 +-
 .../macro/mall/mapper/SmsCouponHistoryMapper.java  |   2 +-
 .../com/macro/mall/mapper/SmsCouponMapper.java     |   2 +-
 .../SmsCouponProductCategoryRelationMapper.java    |   2 +-
 .../mapper/SmsCouponProductRelationMapper.java     |   2 +-
 .../mall/mapper/SmsFlashPromotionLogMapper.java    |   2 +-
 .../macro/mall/mapper/SmsFlashPromotionMapper.java |   2 +-
 .../SmsFlashPromotionProductRelationMapper.java    |   2 +-
 .../mapper/SmsFlashPromotionSessionMapper.java     |   2 +-
 .../macro/mall/mapper/SmsHomeAdvertiseMapper.java  |   2 +-
 .../com/macro/mall/mapper/SmsHomeBrandMapper.java  |   2 +-
 .../macro/mall/mapper/SmsHomeNewProductMapper.java |   2 +-
 .../mall/mapper/SmsHomeRecommendProductMapper.java |   2 +-
 .../mall/mapper/SmsHomeRecommendSubjectMapper.java |   2 +-
 .../macro/mall/mapper/UmsAdminLoginLogMapper.java  |   2 +-
 .../java/com/macro/mall/mapper/UmsAdminMapper.java |   2 +-
 .../mapper/UmsAdminPermissionRelationMapper.java   |   2 +-
 .../mall/mapper/UmsAdminRoleRelationMapper.java    |   2 +-
 .../mall/mapper/UmsGrowthChangeHistoryMapper.java  |   2 +-
 .../mapper/UmsIntegrationChangeHistoryMapper.java  |   2 +-
 .../mapper/UmsIntegrationConsumeSettingMapper.java |   2 +-
 .../macro/mall/mapper/UmsMemberLevelMapper.java    |   2 +-
 .../macro/mall/mapper/UmsMemberLoginLogMapper.java |   2 +-
 .../com/macro/mall/mapper/UmsMemberMapper.java     |   2 +-
 .../mapper/UmsMemberMemberTagRelationMapper.java   |   2 +-
 .../UmsMemberProductCategoryRelationMapper.java    |   2 +-
 .../mall/mapper/UmsMemberReceiveAddressMapper.java |   2 +-
 .../mall/mapper/UmsMemberRuleSettingMapper.java    |   2 +-
 .../mall/mapper/UmsMemberStatisticsInfoMapper.java |   2 +-
 .../com/macro/mall/mapper/UmsMemberTagMapper.java  |   2 +-
 .../com/macro/mall/mapper/UmsMemberTaskMapper.java |   2 +-
 .../com/macro/mall/mapper/UmsPermissionMapper.java |   2 +-
 .../java/com/macro/mall/mapper/UmsRoleMapper.java  |   2 +-
 .../mapper/UmsRolePermissionRelationMapper.java    |   2 +-
 .../macro/mall/mapper/CmsHelpCategoryMapper.xml    |   2 +-
 .../com/macro/mall/mapper/CmsHelpMapper.xml        |   2 +-
 .../macro/mall/mapper/CmsMemberReportMapper.xml    |   2 +-
 .../macro/mall/mapper/CmsPrefrenceAreaMapper.xml   |   2 +-
 .../CmsPrefrenceAreaProductRelationMapper.xml      |   2 +-
 .../macro/mall/mapper/CmsSubjectCategoryMapper.xml |   2 +-
 .../macro/mall/mapper/CmsSubjectCommentMapper.xml  |   2 +-
 .../com/macro/mall/mapper/CmsSubjectMapper.xml     |   2 +-
 .../mapper/CmsSubjectProductRelationMapper.xml     |   2 +-
 .../macro/mall/mapper/CmsTopicCategoryMapper.xml   |   2 +-
 .../macro/mall/mapper/CmsTopicCommentMapper.xml    |   2 +-
 .../com/macro/mall/mapper/CmsTopicMapper.xml       |   2 +-
 .../com/macro/mall/mapper/OmsCartItemMapper.xml    |   2 +-
 .../macro/mall/mapper/OmsCompanyAddressMapper.xml  |   2 +-
 .../com/macro/mall/mapper/OmsOrderItemMapper.xml   |   2 +-
 .../com/macro/mall/mapper/OmsOrderMapper.xml       |   2 +-
 .../mall/mapper/OmsOrderOperateHistoryMapper.xml   |   2 +-
 .../mall/mapper/OmsOrderReturnApplyMapper.xml      |   2 +-
 .../mall/mapper/OmsOrderReturnReasonMapper.xml     |   2 +-
 .../macro/mall/mapper/OmsOrderSettingMapper.xml    |   2 +-
 .../com/macro/mall/mapper/PmsAlbumMapper.xml       |   2 +-
 .../com/macro/mall/mapper/PmsAlbumPicMapper.xml    |   2 +-
 .../com/macro/mall/mapper/PmsBrandMapper.xml       |   2 +-
 .../com/macro/mall/mapper/PmsCommentMapper.xml     |   2 +-
 .../macro/mall/mapper/PmsCommentReplayMapper.xml   |   2 +-
 .../macro/mall/mapper/PmsFeightTemplateMapper.xml  |   2 +-
 .../com/macro/mall/mapper/PmsMemberPriceMapper.xml |   2 +-
 .../mapper/PmsProductAttributeCategoryMapper.xml   |   2 +-
 .../mall/mapper/PmsProductAttributeMapper.xml      |   2 +-
 .../mall/mapper/PmsProductAttributeValueMapper.xml |   2 +-
 .../PmsProductCategoryAttributeRelationMapper.xml  |   2 +-
 .../macro/mall/mapper/PmsProductCategoryMapper.xml |   2 +-
 .../mall/mapper/PmsProductFullReductionMapper.xml  |   2 +-
 .../macro/mall/mapper/PmsProductLadderMapper.xml   |   2 +-
 .../com/macro/mall/mapper/PmsProductMapper.xml     |   2 +-
 .../mall/mapper/PmsProductOperateLogMapper.xml     |   2 +-
 .../mall/mapper/PmsProductVertifyRecordMapper.xml  |   2 +-
 .../com/macro/mall/mapper/PmsSkuStockMapper.xml    |   2 +-
 .../macro/mall/mapper/SmsCouponHistoryMapper.xml   |   2 +-
 .../com/macro/mall/mapper/SmsCouponMapper.xml      |   2 +-
 .../SmsCouponProductCategoryRelationMapper.xml     |   2 +-
 .../mall/mapper/SmsCouponProductRelationMapper.xml |   2 +-
 .../mall/mapper/SmsFlashPromotionLogMapper.xml     |   2 +-
 .../macro/mall/mapper/SmsFlashPromotionMapper.xml  |   2 +-
 .../SmsFlashPromotionProductRelationMapper.xml     |   2 +-
 .../mall/mapper/SmsFlashPromotionSessionMapper.xml |   2 +-
 .../macro/mall/mapper/SmsHomeAdvertiseMapper.xml   |   2 +-
 .../com/macro/mall/mapper/SmsHomeBrandMapper.xml   |   2 +-
 .../macro/mall/mapper/SmsHomeNewProductMapper.xml  |   2 +-
 .../mall/mapper/SmsHomeRecommendProductMapper.xml  |   2 +-
 .../mall/mapper/SmsHomeRecommendSubjectMapper.xml  |   2 +-
 .../macro/mall/mapper/UmsAdminLoginLogMapper.xml   |   2 +-
 .../com/macro/mall/mapper/UmsAdminMapper.xml       |   2 +-
 .../mapper/UmsAdminPermissionRelationMapper.xml    |   2 +-
 .../mall/mapper/UmsAdminRoleRelationMapper.xml     |   2 +-
 .../mall/mapper/UmsGrowthChangeHistoryMapper.xml   |   2 +-
 .../mapper/UmsIntegrationChangeHistoryMapper.xml   |   2 +-
 .../mapper/UmsIntegrationConsumeSettingMapper.xml  |   2 +-
 .../com/macro/mall/mapper/UmsMemberLevelMapper.xml |   2 +-
 .../macro/mall/mapper/UmsMemberLoginLogMapper.xml  |   2 +-
 .../com/macro/mall/mapper/UmsMemberMapper.xml      |   2 +-
 .../mapper/UmsMemberMemberTagRelationMapper.xml    |   2 +-
 .../UmsMemberProductCategoryRelationMapper.xml     |   2 +-
 .../mall/mapper/UmsMemberReceiveAddressMapper.xml  |   2 +-
 .../mall/mapper/UmsMemberRuleSettingMapper.xml     |   2 +-
 .../mall/mapper/UmsMemberStatisticsInfoMapper.xml  |   2 +-
 .../com/macro/mall/mapper/UmsMemberTagMapper.xml   |   2 +-
 .../com/macro/mall/mapper/UmsMemberTaskMapper.xml  |   2 +-
 .../com/macro/mall/mapper/UmsPermissionMapper.xml  |   2 +-
 .../com/macro/mall/mapper/UmsRoleMapper.xml        |   2 +-
 .../mapper/UmsRolePermissionRelationMapper.xml     |   2 +-
 mall-mbg/src/main/resources/generator.properties   |   2 +-
 mall-mbg/src/main/resources/generatorConfig.xml    |   2 +
 mall-portal/.mvn/wrapper/maven-wrapper.jar         | Bin 47610 -> 0 bytes
 mall-portal/.mvn/wrapper/maven-wrapper.properties  |   1 -
 mall-portal/mvnw                                   | 225 ---------------------
 mall-portal/mvnw.cmd                               | 143 -------------
 mall-portal/pom.xml                                |  20 +-
 .../portal/component/GoAccessDeniedHandler.java    |   2 +-
 .../component/GoAuthenticationEntryPoint.java      |   2 +-
 .../component/GoAuthenticationFailureHandler.java  |   2 +-
 .../macro/mall/portal/config/SecurityConfig.java   |   3 +-
 .../com/macro/mall/portal/config/TomcatConfig.java |   2 +-
 .../service/impl/OmsPortalOrderServiceImpl.java    |   2 +-
 .../service/impl/OmsPromotionServiceImpl.java      |   2 +-
 .../service/impl/UmsMemberCouponServiceImpl.java   |   2 +-
 mall-portal/src/main/resources/application-dev.yml |   7 +-
 .../src/main/resources/application-https.yml       |  52 +++++
 mall-search/.mvn/wrapper/maven-wrapper.jar         | Bin 47610 -> 0 bytes
 mall-search/.mvn/wrapper/maven-wrapper.properties  |   1 -
 mall-search/mvnw                                   | 225 ---------------------
 mall-search/mvnw.cmd                               | 143 -------------
 mall-search/pom.xml                                |   6 +-
 pom.xml                                            | 119 ++++++++++-
 220 files changed, 712 insertions(+), 1597 deletions(-)
 create mode 100644 document/docker/docker-compose-app.yml
 create mode 100644 document/docker/docker-compose-env.yml
 delete mode 100644 document/docker/docker-compose.yml
 delete mode 100644 document/docker/host.txt
 create mode 100644 document/docker/nginx.conf
 delete mode 100644 document/elk/elk.md
 rename "document/mind/\345\225\206\345\237\216App.emmx" => document/mind/app.emmx (100%)
 create mode 100644 document/mind/cms.emmx
 rename "document/mind/\351\246\226\351\241\265.emmx" => document/mind/home.emmx (100%)
 create mode 100644 document/mind/oms.emmx
 create mode 100644 document/mind/pms.emmx
 create mode 100644 document/mind/sms.emmx
 create mode 100644 document/mind/ums.emmx
 delete mode 100644 "document/mind/\344\277\203\351\224\200.emmx"
 delete mode 100644 "document/mind/\345\206\205\345\256\271.emmx"
 delete mode 100644 "document/mind/\345\225\206\345\223\201.emmx"
 delete mode 100644 "document/mind/\347\224\250\346\210\267.emmx"
 delete mode 100644 "document/mind/\350\256\242\345\215\225.emmx"
 create mode 100644 "document/pos/\344\270\232\345\212\241\346\236\266\346\236\204\345\233\276.pos"
 create mode 100644 "document/pos/\347\263\273\347\273\237\346\236\266\346\236\204\345\233\276.pos"
 create mode 100644 "document/pos/\351\241\271\347\233\256\345\274\200\345\217\221\350\277\233\345\272\246\345\233\276.pos"
 rename README-DEV.md => document/reference/dev_flow.md (87%)
 create mode 100644 mall-admin/src/main/java/com/macro/mall/config/GlobalCorsConfig.java
 create mode 100644 mall-admin/src/main/java/com/macro/mall/dto/UpdateAdminPasswordParam.java
 delete mode 100644 mall-demo/.mvn/wrapper/maven-wrapper.jar
 delete mode 100644 mall-demo/.mvn/wrapper/maven-wrapper.properties
 delete mode 100644 mall-demo/mvnw
 delete mode 100644 mall-demo/mvnw.cmd
 rename mall-demo/src/main/java/com/macro/mall/{ => demo}/MallDemoApplication.java (90%)
 delete mode 100644 mall-portal/.mvn/wrapper/maven-wrapper.jar
 delete mode 100644 mall-portal/.mvn/wrapper/maven-wrapper.properties
 delete mode 100644 mall-portal/mvnw
 delete mode 100644 mall-portal/mvnw.cmd
 create mode 100644 mall-portal/src/main/resources/application-https.yml
 delete mode 100644 mall-search/.mvn/wrapper/maven-wrapper.jar
 delete mode 100644 mall-search/.mvn/wrapper/maven-wrapper.properties
 delete mode 100644 mall-search/mvnw
 delete mode 100644 mall-search/mvnw.cmd

wulf@wulf00 MINGW64 /e/workspace/mall (master)
$ Total 0 (delta 0), reused 0 (delta 0)
To https://github.com/wuxun1997/mall.git
   79000a1..dc14ed5  master -> master

wulf@wulf00 MINGW64 /e/workspace/mall (master)

  别人的远程仓库master分支下到本地叫upstream,本地fork分支叫master,合并后提交你的远程仓库master分支。

 类似资料: