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

　　几个月前看到一个电商项目，文档比较全，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分支。

github上fork分支后再合入原master分支的改动的更多相关文章

从 github 上 fork repositories 后，如何和原仓库同步？
1. 首先要先确定一下是否建立了主repo的远程源: git remote -v 2. 如果里面只能看到你自己的两个源(fetch 和 push),那就需要添加主repo的源: git remote ...
Github上fork项目后与原项目保持同步
**步骤** 假设来源为 `https://github.com/_original/_project.git` fork 项目为 `https://github.com/_your/_projec ...
如何在github上fork以及同步原作者代码
参考网址:https://blog.csdn.net/llll2020/article/details/86140488 转 GitHub上fork别人打代码后如何保持和原作者同步的更新 </ ...
github上fork了别人的项目后，再同步更新别人的提交(转)
原文地址:github上fork了别人的项目后,再同步更新别人的提交我从github网站和用git命令两种方式说一下. github网站上操作打开自己的仓库,进入code下面. 点击new pul ...
github上fork原项目，如何将本地仓库代码更新到最新版本？
场景: 在github上fork原项目,项目组成员发起pull request提交了代码,这时自己在本地仓库该如何更新到最新代码? 操作方法如下: 方法一.从github上进行操作然后更新登录自己的 ...
[SVN] 分支同步、合入主干操作分享
冲突的解决原则不是自己修改的地方就使用主干的. 需要特别注意的是: 分支同步主干时,远端(theirs)是主干,本地(mine/working)的是分支: 分支合入主干时,本地(mine/worki ...
Github上fork的项目如何merge原Git项目
问题场景小明在Github上fork了一个大佬的项目,并clone到本地开发一段时间,再提交merge request到原Git项目,过了段时间,原作者联系小明,扔给他下面这幅截图并告知合并处理冲突 ...
在github上fork项目如何同步并解决冲突
在github上fork项目如何同步并解决冲突在github上有些项目我们可能会进行一些自己功能的添加但是提交PR后作者基于设计或者其他原因考虑没有通过,但是这个功能又是我们必须的.这时我们就想自己 ...
github上fork别人的代码之后，如何保持和原作者同步的更新
1.从自己fork之后的版本库clone $ git clone -o chucklu https://github.com/chucklu/Hearthstone-Deck-Tracker.git ...

随机推荐

第三天Beta冲刺
团队作业Beta冲刺项目内容这个作业属于哪个课程任课教师博客主页链接这个作业的要求在哪里作业链接地址团队名称你们都是魔鬼吗作业学习目标 (1)掌握软件黑盒测试技术:(2)学会编制软件 ...
《AlwaysRun!》第七次作业：团队项目设计完善&编码
项目内容这个作业属于哪个课程 https://home.cnblogs.com/u/nwnu-daizh/ 这个作业的要求在哪里 https://www.cnblogs.com/nwnu-da ...
TODO : 一些新的学习计划
1.读完jvm那本书 2.加深Android的开发知识 3.编写atx的demo 4.跑几个apk的性能测试并做详细的性能分析 5.尝试实现一个uiautomator多个手机同时执行脚本的可能性(连线 ...
RCNN,Fast RCNN,Faster RCNN 的前生今世：（3） SPP - Net
SPP-Net是出自2015年发表在IEEE上的论文-<Spatial Pyramid Pooling in Deep ConvolutionalNetworks for Visual Reco ...
[TypeScript] Modifier
TypeScript 2.8 adds the ability for a mapped type to either add or remove a particular modifier. Spe ...
判断指定对象是否进入浏览器可视窗口，true 进入，false 没进入
//判断指定对象是否进入浏览器可视窗口,true 进入,false 没进入 var $win = $(window);//jQuery 的 window 对象即:文档对象 function isVi ...
LOJ P10065 北极通讯网络题解
每日一题 day39 打卡 Analysis 1.当正向思考受阻时,逆向思维可能有奇效. 2.问题转化为:找到最小的d,使去掉所有权值>d的边之后,连通支的个数<k; 3.定理:如果去掉所 ...
learning java Runtime 类获取内存及处理器核数信息
var rt = Runtime.getRuntime(); System.*)); System.*)); System.*)); System.out.println(rt.availablePr ...
洛谷P1650赛马与codevs 2181 田忌赛马
洛谷P1650 赛马题目描述我国历史上有个著名的故事: 那是在2300年以前.齐国的大将军田忌喜欢赛马.他经常和齐王赛马.他和齐王都有三匹马:常规马,上级马,超级马.一共赛三局,每局的胜者可以从负 ...
模板 - 数学 - 数论 - Miller-Rabin算法
使用Fermat小定理(Fermat's little theorem)的原理进行测试,不满足 $2^{n-1}\;\mod\;n\;=\;1$ 的n一定不是质数:如果满足的话则多半是质数,满足上 ...

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

github上fork分支后再合入原master分支的改动的更多相关文章

随机推荐

热门专题