几个月前看到一个电商项目，文档比较全，fork下来学习下。后来因为其他事情耽搁了，现在想重新看看，发现改动比较大，master分支跟我fork下来的分支不一样了。咋办？简单，把最新的master分支下到本地，把改动merge到本地fork分支后，提交到fork分支。
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: , done.
remote: Counting objects: % (/), done.
remote: Compressing objects: % (/), done.
Receivinremote: Total (delta ), reused (delta ), pack-reused
Receiving objects: % (/), 1.21 MiB | 541.00 KiB/s, done.
Resolving deltas: % (/), completed with 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 | ++++++--------
document/docker/docker-compose-app.yml | +++
document/docker/docker-compose-env.yml | +++++++
document/docker/docker-compose.yml | ------
document/docker/host.txt | -
document/docker/nginx.conf | +++++
document/elk/elk.md | --
document/elk/logstash-springboot.conf | +-
.../mind/app.emmx | Bin
document/mind/cms.emmx | Bin -> bytes
.../mind/home.emmx | Bin
document/mind/oms.emmx | Bin -> bytes
document/mind/pms.emmx | Bin -> bytes
document/mind/sms.emmx | Bin -> bytes
document/mind/ums.emmx | Bin -> bytes
"document/mind/\344\277\203\351\224\200.emmx" | Bin -> bytes
"document/mind/\345\206\205\345\256\271.emmx" | Bin -> bytes
"document/mind/\345\225\206\345\223\201.emmx" | Bin -> bytes
"document/mind/\347\224\250\346\210\267.emmx" | Bin -> bytes
"document/mind/\350\256\242\345\215\225.emmx" | Bin -> bytes
...\\\\\\\\\\.pos" | 1 +
...\\\\\\\\\\.pos" | 1 +
...\\\\\\\\\\.pos" | 1 +
README-DEV.md => document/reference/dev_flow.md | ++-----
document/resource/mall_dev_flow.png | Bin -> bytes
document/resource/mall_dev_flow_note.png | Bin -> bytes
document/resource/mind_content.jpg | Bin -> bytes
document/resource/mind_member.jpg | Bin -> bytes
document/resource/mind_order.jpg | Bin -> bytes
document/resource/mind_portal.jpg | Bin -> bytes
document/resource/mind_product.jpg | Bin -> bytes
document/resource/mind_sale.jpg | Bin -> bytes
document/sql/mall.sql | +-
mall-admin/pom.xml | +-
.../com/macro/mall/component/WebLogAspect.java | +-
.../com/macro/mall/config/GlobalCorsConfig.java | ++++
.../java/com/macro/mall/config/SecurityConfig.java | +--
.../macro/mall/controller/UmsAdminController.java | ++
.../mall/dto/SmsFlashPromotionSessionDetail.java | +-
.../macro/mall/dto/UpdateAdminPasswordParam.java | ++
.../SmsFlashPromotionProductRelationService.java | +-
.../com/macro/mall/service/UmsAdminService.java | +
...msFlashPromotionProductRelationServiceImpl.java | +-
.../impl/SmsFlashPromotionSessionServiceImpl.java | +-
.../mall/service/impl/UmsAdminServiceImpl.java | +++
mall-common/pom.xml | +-
mall-demo/.mvn/wrapper/maven-wrapper.jar | Bin -> bytes
mall-demo/.mvn/wrapper/maven-wrapper.properties | -
mall-demo/mvnw | ---------------------
mall-demo/mvnw.cmd | -------------
mall-demo/pom.xml | +-
.../macro/mall/{ => demo}/MallDemoApplication.java | +-
.../macro/mall/demo/controller/DemoController.java | +-
.../controller/RestTemplateDemoController.java | +-
mall-mbg/pom.xml | +-
.../macro/mall/mapper/CmsHelpCategoryMapper.java | +-
.../java/com/macro/mall/mapper/CmsHelpMapper.java | +-
.../macro/mall/mapper/CmsMemberReportMapper.java | +-
.../macro/mall/mapper/CmsPrefrenceAreaMapper.java | +-
.../CmsPrefrenceAreaProductRelationMapper.java | +-
.../mall/mapper/CmsSubjectCategoryMapper.java | +-
.../macro/mall/mapper/CmsSubjectCommentMapper.java | +-
.../com/macro/mall/mapper/CmsSubjectMapper.java | +-
.../mapper/CmsSubjectProductRelationMapper.java | +-
.../macro/mall/mapper/CmsTopicCategoryMapper.java | +-
.../macro/mall/mapper/CmsTopicCommentMapper.java | +-
.../java/com/macro/mall/mapper/CmsTopicMapper.java | +-
.../com/macro/mall/mapper/OmsCartItemMapper.java | +-
.../macro/mall/mapper/OmsCompanyAddressMapper.java | +-
.../com/macro/mall/mapper/OmsOrderItemMapper.java | +-
.../java/com/macro/mall/mapper/OmsOrderMapper.java | +-
.../mall/mapper/OmsOrderOperateHistoryMapper.java | +-
.../mall/mapper/OmsOrderReturnApplyMapper.java | +-
.../mall/mapper/OmsOrderReturnReasonMapper.java | +-
.../macro/mall/mapper/OmsOrderSettingMapper.java | +-
.../java/com/macro/mall/mapper/PmsAlbumMapper.java | +-
.../com/macro/mall/mapper/PmsAlbumPicMapper.java | +-
.../java/com/macro/mall/mapper/PmsBrandMapper.java | +-
.../com/macro/mall/mapper/PmsCommentMapper.java | +-
.../macro/mall/mapper/PmsCommentReplayMapper.java | +-
.../macro/mall/mapper/PmsFeightTemplateMapper.java | +-
.../macro/mall/mapper/PmsMemberPriceMapper.java | +-
.../mapper/PmsProductAttributeCategoryMapper.java | +-
.../mall/mapper/PmsProductAttributeMapper.java | +-
.../mapper/PmsProductAttributeValueMapper.java | +-
.../PmsProductCategoryAttributeRelationMapper.java | +-
.../mall/mapper/PmsProductCategoryMapper.java | +-
.../mall/mapper/PmsProductFullReductionMapper.java | +-
.../macro/mall/mapper/PmsProductLadderMapper.java | +-
.../com/macro/mall/mapper/PmsProductMapper.java | +-
.../mall/mapper/PmsProductOperateLogMapper.java | +-
.../mall/mapper/PmsProductVertifyRecordMapper.java | +-
.../com/macro/mall/mapper/PmsSkuStockMapper.java | +-
.../macro/mall/mapper/SmsCouponHistoryMapper.java | +-
.../com/macro/mall/mapper/SmsCouponMapper.java | +-
.../SmsCouponProductCategoryRelationMapper.java | +-
.../mapper/SmsCouponProductRelationMapper.java | +-
.../mall/mapper/SmsFlashPromotionLogMapper.java | +-
.../macro/mall/mapper/SmsFlashPromotionMapper.java | +-
.../SmsFlashPromotionProductRelationMapper.java | +-
.../mapper/SmsFlashPromotionSessionMapper.java | +-
.../macro/mall/mapper/SmsHomeAdvertiseMapper.java | +-
.../com/macro/mall/mapper/SmsHomeBrandMapper.java | +-
.../macro/mall/mapper/SmsHomeNewProductMapper.java | +-
.../mall/mapper/SmsHomeRecommendProductMapper.java | +-
.../mall/mapper/SmsHomeRecommendSubjectMapper.java | +-
.../macro/mall/mapper/UmsAdminLoginLogMapper.java | +-
.../java/com/macro/mall/mapper/UmsAdminMapper.java | +-
.../mapper/UmsAdminPermissionRelationMapper.java | +-
.../mall/mapper/UmsAdminRoleRelationMapper.java | +-
.../mall/mapper/UmsGrowthChangeHistoryMapper.java | +-
.../mapper/UmsIntegrationChangeHistoryMapper.java | +-
.../mapper/UmsIntegrationConsumeSettingMapper.java | +-
.../macro/mall/mapper/UmsMemberLevelMapper.java | +-
.../macro/mall/mapper/UmsMemberLoginLogMapper.java | +-
.../com/macro/mall/mapper/UmsMemberMapper.java | +-
.../mapper/UmsMemberMemberTagRelationMapper.java | +-
.../UmsMemberProductCategoryRelationMapper.java | +-
.../mall/mapper/UmsMemberReceiveAddressMapper.java | +-
.../mall/mapper/UmsMemberRuleSettingMapper.java | +-
.../mall/mapper/UmsMemberStatisticsInfoMapper.java | +-
.../com/macro/mall/mapper/UmsMemberTagMapper.java | +-
.../com/macro/mall/mapper/UmsMemberTaskMapper.java | +-
.../com/macro/mall/mapper/UmsPermissionMapper.java | +-
.../java/com/macro/mall/mapper/UmsRoleMapper.java | +-
.../mapper/UmsRolePermissionRelationMapper.java | +-
.../macro/mall/mapper/CmsHelpCategoryMapper.xml | +-
.../com/macro/mall/mapper/CmsHelpMapper.xml | +-
.../macro/mall/mapper/CmsMemberReportMapper.xml | +-
.../macro/mall/mapper/CmsPrefrenceAreaMapper.xml | +-
.../CmsPrefrenceAreaProductRelationMapper.xml | +-
.../macro/mall/mapper/CmsSubjectCategoryMapper.xml | +-
.../macro/mall/mapper/CmsSubjectCommentMapper.xml | +-
.../com/macro/mall/mapper/CmsSubjectMapper.xml | +-
.../mapper/CmsSubjectProductRelationMapper.xml | +-
.../macro/mall/mapper/CmsTopicCategoryMapper.xml | +-
.../macro/mall/mapper/CmsTopicCommentMapper.xml | +-
.../com/macro/mall/mapper/CmsTopicMapper.xml | +-
.../com/macro/mall/mapper/OmsCartItemMapper.xml | +-
.../macro/mall/mapper/OmsCompanyAddressMapper.xml | +-
.../com/macro/mall/mapper/OmsOrderItemMapper.xml | +-
.../com/macro/mall/mapper/OmsOrderMapper.xml | +-
.../mall/mapper/OmsOrderOperateHistoryMapper.xml | +-
.../mall/mapper/OmsOrderReturnApplyMapper.xml | +-
.../mall/mapper/OmsOrderReturnReasonMapper.xml | +-
.../macro/mall/mapper/OmsOrderSettingMapper.xml | +-
.../com/macro/mall/mapper/PmsAlbumMapper.xml | +-
.../com/macro/mall/mapper/PmsAlbumPicMapper.xml | +-
.../com/macro/mall/mapper/PmsBrandMapper.xml | +-
.../com/macro/mall/mapper/PmsCommentMapper.xml | +-
.../macro/mall/mapper/PmsCommentReplayMapper.xml | +-
.../macro/mall/mapper/PmsFeightTemplateMapper.xml | +-
.../com/macro/mall/mapper/PmsMemberPriceMapper.xml | +-
.../mapper/PmsProductAttributeCategoryMapper.xml | +-
.../mall/mapper/PmsProductAttributeMapper.xml | +-
.../mall/mapper/PmsProductAttributeValueMapper.xml | +-
.../PmsProductCategoryAttributeRelationMapper.xml | +-
.../macro/mall/mapper/PmsProductCategoryMapper.xml | +-
.../mall/mapper/PmsProductFullReductionMapper.xml | +-
.../macro/mall/mapper/PmsProductLadderMapper.xml | +-
.../com/macro/mall/mapper/PmsProductMapper.xml | +-
.../mall/mapper/PmsProductOperateLogMapper.xml | +-
.../mall/mapper/PmsProductVertifyRecordMapper.xml | +-
.../com/macro/mall/mapper/PmsSkuStockMapper.xml | +-
.../macro/mall/mapper/SmsCouponHistoryMapper.xml | +-
.../com/macro/mall/mapper/SmsCouponMapper.xml | +-
.../SmsCouponProductCategoryRelationMapper.xml | +-
.../mall/mapper/SmsCouponProductRelationMapper.xml | +-
.../mall/mapper/SmsFlashPromotionLogMapper.xml | +-
.../macro/mall/mapper/SmsFlashPromotionMapper.xml | +-
.../SmsFlashPromotionProductRelationMapper.xml | +-
.../mall/mapper/SmsFlashPromotionSessionMapper.xml | +-
.../macro/mall/mapper/SmsHomeAdvertiseMapper.xml | +-
.../com/macro/mall/mapper/SmsHomeBrandMapper.xml | +-
.../macro/mall/mapper/SmsHomeNewProductMapper.xml | +-
.../mall/mapper/SmsHomeRecommendProductMapper.xml | +-
.../mall/mapper/SmsHomeRecommendSubjectMapper.xml | +-
.../macro/mall/mapper/UmsAdminLoginLogMapper.xml | +-
.../com/macro/mall/mapper/UmsAdminMapper.xml | +-
.../mapper/UmsAdminPermissionRelationMapper.xml | +-
.../mall/mapper/UmsAdminRoleRelationMapper.xml | +-
.../mall/mapper/UmsGrowthChangeHistoryMapper.xml | +-
.../mapper/UmsIntegrationChangeHistoryMapper.xml | +-
.../mapper/UmsIntegrationConsumeSettingMapper.xml | +-
.../com/macro/mall/mapper/UmsMemberLevelMapper.xml | +-
.../macro/mall/mapper/UmsMemberLoginLogMapper.xml | +-
.../com/macro/mall/mapper/UmsMemberMapper.xml | +-
.../mapper/UmsMemberMemberTagRelationMapper.xml | +-
.../UmsMemberProductCategoryRelationMapper.xml | +-
.../mall/mapper/UmsMemberReceiveAddressMapper.xml | +-
.../mall/mapper/UmsMemberRuleSettingMapper.xml | +-
.../mall/mapper/UmsMemberStatisticsInfoMapper.xml | +-
.../com/macro/mall/mapper/UmsMemberTagMapper.xml | +-
.../com/macro/mall/mapper/UmsMemberTaskMapper.xml | +-
.../com/macro/mall/mapper/UmsPermissionMapper.xml | +-
.../com/macro/mall/mapper/UmsRoleMapper.xml | +-
.../mapper/UmsRolePermissionRelationMapper.xml | +-
mall-mbg/src/main/resources/generator.properties | +-
mall-mbg/src/main/resources/generatorConfig.xml | +
mall-portal/.mvn/wrapper/maven-wrapper.jar | Bin -> bytes
mall-portal/.mvn/wrapper/maven-wrapper.properties | -
mall-portal/mvnw | ---------------------
mall-portal/mvnw.cmd | -------------
mall-portal/pom.xml | +-
.../portal/component/GoAccessDeniedHandler.java | +-
.../component/GoAuthenticationEntryPoint.java | +-
.../component/GoAuthenticationFailureHandler.java | +-
.../macro/mall/portal/config/SecurityConfig.java | +-
.../com/macro/mall/portal/config/TomcatConfig.java | +-
.../service/impl/OmsPortalOrderServiceImpl.java | +-
.../service/impl/OmsPromotionServiceImpl.java | +-
.../service/impl/UmsMemberCouponServiceImpl.java | +-
mall-portal/src/main/resources/application-dev.yml | +-
.../src/main/resources/application-https.yml | +++++
mall-search/.mvn/wrapper/maven-wrapper.jar | Bin -> bytes
mall-search/.mvn/wrapper/maven-wrapper.properties | -
mall-search/mvnw | ---------------------
mall-search/mvnw.cmd | -------------
mall-search/pom.xml | +-
pom.xml | ++++++++++-
files changed, insertions(+), deletions(-)
create mode document/docker/docker-compose-app.yml
create mode document/docker/docker-compose-env.yml
delete mode document/docker/docker-compose.yml
delete mode document/docker/host.txt
create mode document/docker/nginx.conf
delete mode document/elk/elk.md
rename "document/mind/\345\225\206\345\237\216App.emmx" => document/mind/app.emmx (%)
create mode document/mind/cms.emmx
rename "document/mind/\351\246\226\351\241\265.emmx" => document/mind/home.emmx (%)
create mode document/mind/oms.emmx
create mode document/mind/pms.emmx
create mode document/mind/sms.emmx
create mode document/mind/ums.emmx
delete mode "document/mind/\344\277\203\351\224\200.emmx"
delete mode "document/mind/\345\206\205\345\256\271.emmx"
delete mode "document/mind/\345\225\206\345\223\201.emmx"
delete mode "document/mind/\347\224\250\346\210\267.emmx"
delete mode "document/mind/\350\256\242\345\215\225.emmx"
create mode "document/pos/\344\270\232\345\212\241\346\236\266\346\236\204\345\233\276.pos"
create mode "document/pos/\347\263\273\347\273\237\346\236\266\346\236\204\345\233\276.pos"
create mode "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 (%)
create mode mall-admin/src/main/java/com/macro/mall/config/GlobalCorsConfig.java
create mode mall-admin/src/main/java/com/macro/mall/dto/UpdateAdminPasswordParam.java
delete mode mall-demo/.mvn/wrapper/maven-wrapper.jar
delete mode mall-demo/.mvn/wrapper/maven-wrapper.properties
delete mode mall-demo/mvnw
delete mode mall-demo/mvnw.cmd
rename mall-demo/src/main/java/com/macro/mall/{ => demo}/MallDemoApplication.java (%)
delete mode mall-portal/.mvn/wrapper/maven-wrapper.jar
delete mode mall-portal/.mvn/wrapper/maven-wrapper.properties
delete mode mall-portal/mvnw
delete mode mall-portal/mvnw.cmd
create mode mall-portal/src/main/resources/application-https.yml
delete mode mall-search/.mvn/wrapper/maven-wrapper.jar
delete mode mall-search/.mvn/wrapper/maven-wrapper.properties
delete mode mall-search/mvnw
delete mode mall-search/mvnw.cmd wulf@wulf00 MINGW64 /e/workspace/mall (master)
$ git push
Total (delta ), reused (delta )
To github.com:wuxun1997/mall.git
79000a1..dc14ed5 master -> master wulf@wulf00 MINGW64 /e/workspace/mall (master)
别人的远程仓库master分支下到本地叫upstream，本地fork分支叫master，合并后提交你的远程仓库master分支。