[{"data":1,"prerenderedAt":232},["ShallowReactive",2],{"tag-工作流-1":3},{"title":4,"articles":5,"hot_article":17,"month_arch":80,"total":228,"cover":229},"工作流 - 独孤影的博客",[6],{"id":7,"title":8,"uri":8,"author":9,"tags":10,"created_at":14,"view_count":15,"content":16},40,"Git团队开发中PR工作模式的反思","duguying",[11,12,13],"git","pr","工作流","2016-07-14 21:41:07",3424,"\u003Cp>在公司团队协作用了大半年的Git了，PR工作模式也用了半年。由一个用Git装逼的假老手成长为真正用Git进行团队协作开发的老油条。这其中也有一些值得反思的东西。我很崇拜PR的工作模式，因为它基本上是优秀的开源软件工作模式的代表，众多的开发者自发的给开源项目发送PR，以前总是盼望着自己的开源项目会有人发送PR，若是接收到PR就像是收到别人的礼物一般高兴。\u003C\u002Fp>\u003Cp>我之前赞同的PR工作模式是这样的，开发者拿到开发需求之后，在自己的分支开发，然后向主仓库的相关分支发送PR，之后由测试人员在测试机上拉取主仓库相关分支的代码，然后fetch PR所在仓库分支的代码合并(merge)到本地主仓库相关分支，进行测试，测试完毕通过之后才合并PR到分支。我这一想法的灵感来源于 travis-ci 单元测试的工作模式：开发人员发送PR，travis-ci自动进行单元测试，PR管理者参考PR在 travis-ci 上单元测试的结果进行初步判定是否可以合并。但是我忽略了一点，测试人员并非是 travis-ci 上的单元测试。在工作的过程中往往是这样的：\u003C\u002Fp>\u003Cp>开发人员初步开发出某个功能，然后经过自己的初步测试，发送PR到主仓库，测试人员看到有PR了，需要测试了，于是开始测试，但是测试有问题，于是开发人员就必须继续修改提交，然后再次测试，还有一些问题被发现依然存在，继续开发……可是，你突然发现，你的PR被合并了或者是被关闭了，因为要下班了；或者是要下班了，\u003Cspan style=\"line-height: 22.5px;\">PR管理员会问这个PR能否合并\u003C\u002Fspan>，测试人员暂时没发现新的问题，于是测试人员告诉PR管理员“没有问题”，于是PR被合并了。或者没有上面的“PR管理员的询问”，但不管怎样，最后的结果往往是PR被草草的合并了。于是，没有充分测试的PR进入了仓库，甚至进入了发布分支，最终的结果可想而知。\u003C\u002Fp>\u003Cp>在这个过程中，人们往往没有意识到其实是被PR给影响到了。因为开发者一个PR创立之后，在他会有一个潜意识希望PR被合并，测试人员同样也有这么一个潜意识，因为测试PR就是他的工作之一，他也希望PR被合并，对于PR管理员来说同样也有这么一个潜意识，希望PR被处理，不管是合并还是关闭。就是这些潜意识推动这个PR尽早被合并。\u003C\u002Fp>\u003Cp>我个人感觉正确的做法应该是当测试人员测试充分之后再发起PR，避免这些潜意识促使PR过早的被合并。事实上，不管PR是否存在，测试人员都能够从开发者的分支上拉取到开发者的代码合并到主仓库，PR不过是一个形式而已，给合并者带来方便。但是那些错误的理解了PR的人们往往会搞出诸多莫名其妙的东西，比如PR用来人工做代码审核，比如搞个CheckList让人工去查代码中哪儿写得不规范，这些应该是让 Sonar 自动扫描PR中存在的不规范，谁又会有时间去为别人的PR人工做Sonar该做的事情。经过测试人员的充分测试之后，开发者创建PR，这时单元测试测试一遍，然后Sonar扫描一遍，后两者自动化测试通过之后代码才能入库。\u003C\u002Fp>\u003Cp>总之，测试人员功能测试通过之后开发者才能创建PR，自动化工具进行单元测试和Sonar扫描通过后，PR管理员才能允许合并。这才是比较靠谱的PR工作流。\u003C\u002Fp>",{"title":18,"list":19},"最热文章",[20,26,32,38,44,50,56,62,68,74],{"id":21,"title":22,"uri":23,"author":9,"created_at":24,"view_count":25},28,"docker容器目录与主机目录同步","\u002Farticle\u002Fdocker容器目录与主机目录同步","2014-12-31 12:34:08",15573,{"id":27,"title":28,"uri":29,"author":9,"created_at":30,"view_count":31},21,"beego中使用fis","\u002Farticle\u002Fbeego中使用fis","2014-12-03 10:47:56",9253,{"id":33,"title":34,"uri":35,"author":9,"created_at":36,"view_count":37},20,"用github登录，oauth开发","\u002Farticle\u002F用github登录，oauth开发","2014-11-23 13:33:37",9115,{"id":39,"title":40,"uri":41,"author":9,"created_at":42,"view_count":43},18,"windows服务注册工具nssm","\u002Farticle\u002Fwindows服务注册工具nssm","2014-10-31 21:34:39",9054,{"id":45,"title":46,"uri":47,"author":9,"created_at":48,"view_count":49},49,"用latex排版中文书籍","\u002Farticle\u002F用latex排版中文书籍","2016-10-31 11:12:02",8645,{"id":51,"title":52,"uri":53,"author":9,"created_at":54,"view_count":55},19,"texlive中文书签乱码","\u002Farticle\u002Ftexlive中文书签乱码","2014-11-15 02:54:01",8466,{"id":57,"title":58,"uri":59,"author":9,"created_at":60,"view_count":61},6,"Windows上的软件包管理器chocolatey","\u002Farticle\u002FWindows上的软件包管理器chocolatey","2014-08-10 15:55:22",8012,{"id":63,"title":64,"uri":65,"author":9,"created_at":66,"view_count":67},3,"利用开源和免费资源搭建CI环境","\u002Farticle\u002F利用开源和免费资源搭建CI环境","2014-07-04 16:54:58",7740,{"id":69,"title":70,"uri":71,"author":9,"created_at":72,"view_count":73},16,"php-fpm网站目录权限配置","\u002Farticle\u002Fphp-fpm网站目录权限配置","2014-10-18 01:36:10",7276,{"id":75,"title":76,"uri":77,"author":9,"created_at":78,"view_count":79},27,"sublime text 2插件开发，外部修改文件无法重新加载","\u002Farticle\u002Fsublime text 2插件开发，外部修改文件无法重新加载","2014-12-26 20:24:13",7055,{"title":81,"list":82},"按月归档",[83,87,90,93,96,99,102,106,110,113,116,119,123,126,129,133,136,139,142,146,149,152,155,158,161,164,167,170,173,176,179,182,185,188,191,194,197,200,203,206,210,213,216,219,222,225],{"title":84,"uri":85,"view_count":86},"2026年7月","\u002Farchive\u002F2026\u002F7\u002F1","[1]",{"title":88,"uri":89,"view_count":86},"2026年1月","\u002Farchive\u002F2026\u002F1\u002F1",{"title":91,"uri":92,"view_count":86},"2025年4月","\u002Farchive\u002F2025\u002F4\u002F1",{"title":94,"uri":95,"view_count":86},"2024年6月","\u002Farchive\u002F2024\u002F6\u002F1",{"title":97,"uri":98,"view_count":86},"2024年5月","\u002Farchive\u002F2024\u002F5\u002F1",{"title":100,"uri":101,"view_count":86},"2024年4月","\u002Farchive\u002F2024\u002F4\u002F1",{"title":103,"uri":104,"view_count":105},"2023年12月","\u002Farchive\u002F2023\u002F12\u002F1","[6]",{"title":107,"uri":108,"view_count":109},"2023年11月","\u002Farchive\u002F2023\u002F11\u002F1","[2]",{"title":111,"uri":112,"view_count":86},"2023年10月","\u002Farchive\u002F2023\u002F10\u002F1",{"title":114,"uri":115,"view_count":86},"2023年7月","\u002Farchive\u002F2023\u002F7\u002F1",{"title":117,"uri":118,"view_count":109},"2023年6月","\u002Farchive\u002F2023\u002F6\u002F1",{"title":120,"uri":121,"view_count":122},"2023年5月","\u002Farchive\u002F2023\u002F5\u002F1","[3]",{"title":124,"uri":125,"view_count":109},"2023年4月","\u002Farchive\u002F2023\u002F4\u002F1",{"title":127,"uri":128,"view_count":109},"2023年3月","\u002Farchive\u002F2023\u002F3\u002F1",{"title":130,"uri":131,"view_count":132},"2023年2月","\u002Farchive\u002F2023\u002F2\u002F1","[5]",{"title":134,"uri":135,"view_count":86},"2023年1月","\u002Farchive\u002F2023\u002F1\u002F1",{"title":137,"uri":138,"view_count":109},"2022年12月","\u002Farchive\u002F2022\u002F12\u002F1",{"title":140,"uri":141,"view_count":132},"2022年11月","\u002Farchive\u002F2022\u002F11\u002F1",{"title":143,"uri":144,"view_count":145},"2022年10月","\u002Farchive\u002F2022\u002F10\u002F1","[4]",{"title":147,"uri":148,"view_count":105},"2022年9月","\u002Farchive\u002F2022\u002F9\u002F1",{"title":150,"uri":151,"view_count":132},"2022年8月","\u002Farchive\u002F2022\u002F8\u002F1",{"title":153,"uri":154,"view_count":86},"2019年7月","\u002Farchive\u002F2019\u002F7\u002F1",{"title":156,"uri":157,"view_count":86},"2019年2月","\u002Farchive\u002F2019\u002F2\u002F1",{"title":159,"uri":160,"view_count":86},"2018年9月","\u002Farchive\u002F2018\u002F9\u002F1",{"title":162,"uri":163,"view_count":86},"2018年8月","\u002Farchive\u002F2018\u002F8\u002F1",{"title":165,"uri":166,"view_count":86},"2017年11月","\u002Farchive\u002F2017\u002F11\u002F1",{"title":168,"uri":169,"view_count":86},"2017年8月","\u002Farchive\u002F2017\u002F8\u002F1",{"title":171,"uri":172,"view_count":86},"2017年5月","\u002Farchive\u002F2017\u002F5\u002F1",{"title":174,"uri":175,"view_count":86},"2017年4月","\u002Farchive\u002F2017\u002F4\u002F1",{"title":177,"uri":178,"view_count":86},"2016年11月","\u002Farchive\u002F2016\u002F11\u002F1",{"title":180,"uri":181,"view_count":86},"2016年10月","\u002Farchive\u002F2016\u002F10\u002F1",{"title":183,"uri":184,"view_count":109},"2016年9月","\u002Farchive\u002F2016\u002F9\u002F1",{"title":186,"uri":187,"view_count":86},"2016年8月","\u002Farchive\u002F2016\u002F8\u002F1",{"title":189,"uri":190,"view_count":109},"2016年7月","\u002Farchive\u002F2016\u002F7\u002F1",{"title":192,"uri":193,"view_count":132},"2016年6月","\u002Farchive\u002F2016\u002F6\u002F1",{"title":195,"uri":196,"view_count":86},"2015年12月","\u002Farchive\u002F2015\u002F12\u002F1",{"title":198,"uri":199,"view_count":86},"2015年10月","\u002Farchive\u002F2015\u002F10\u002F1",{"title":201,"uri":202,"view_count":109},"2015年2月","\u002Farchive\u002F2015\u002F2\u002F1",{"title":204,"uri":205,"view_count":86},"2015年1月","\u002Farchive\u002F2015\u002F1\u002F1",{"title":207,"uri":208,"view_count":209},"2014年12月","\u002Farchive\u002F2014\u002F12\u002F1","[8]",{"title":211,"uri":212,"view_count":109},"2014年11月","\u002Farchive\u002F2014\u002F11\u002F1",{"title":214,"uri":215,"view_count":132},"2014年10月","\u002Farchive\u002F2014\u002F10\u002F1",{"title":217,"uri":218,"view_count":122},"2014年9月","\u002Farchive\u002F2014\u002F9\u002F1",{"title":220,"uri":221,"view_count":122},"2014年8月","\u002Farchive\u002F2014\u002F8\u002F1",{"title":223,"uri":224,"view_count":122},"2014年7月","\u002Farchive\u002F2014\u002F7\u002F1",{"title":226,"uri":227,"view_count":109},"2013年9月","\u002Farchive\u002F2013\u002F9\u002F1",1,{"url":230,"title":231},"https:\u002F\u002Fimage.duguying.net\u002F2022\u002F09\u002Fij6x8o4s.webp","老家 摄于2020年秋",1790781595328]