打开App
[Web]60 分支的操作：解决冲突、删除分支、取消分支合并
【web前端工程师】72/341
![[Web]59 merge的两种合并：正常合并、快速前移](http://p3-sign.bdxiguaimg.com/tos-cn-i-0004/257be1ae9c6649498a4c44bdd9430905~tplv-pk90l89vgd-crop-center:576:324.jpeg?appId=3586&biz_tag=list_custom%2Fnone&channelId=0&customType=custom%2Fnone&from=704_middle_image&imageType=list&isImmersiveScene=0&is_ios=1&is_stream=0&lk3s=9d3f5bff&logId=20250203174638DC87DAF949F098A88D57&requestFrom=704&version_code=80402&x-expires=1770111999&x-signature=PLMoCSyhGvjQZmWWUBBDJ%2B9KB4g%3D)
App23:05![[Web]60 分支的操作：解决冲突、删除分支、取消分支合并](http://p3-sign.bdxiguaimg.com/tos-cn-i-0004/242343f2970f4205bc060d5e246fa9ce~tplv-pk90l89vgd-crop-center:576:324.jpeg?appId=3586&biz_tag=list_custom%2Fnone&channelId=0&customType=custom%2Fnone&from=704_middle_image&imageType=list&isImmersiveScene=0&is_ios=1&is_stream=0&lk3s=9d3f5bff&logId=20250203174638DC87DAF949F098A88D57&requestFrom=704&version_code=80402&x-expires=1770111999&x-signature=7z6D%2BV9y5dWH9I75rQ5C5ofgM6k%3D)
App20:25![[Web]61 撤销大集合](http://p3-sign.bdxiguaimg.com/tos-cn-i-0004/12c2524671db40c98ae512f5e360ac19~tplv-pk90l89vgd-crop-center:576:324.jpeg?appId=3586&biz_tag=list_custom%2Fnone&channelId=0&customType=custom%2Fnone&from=704_middle_image&imageType=list&isImmersiveScene=0&is_ios=1&is_stream=0&lk3s=9d3f5bff&logId=20250203174638DC87DAF949F098A88D57&requestFrom=704&version_code=80402&x-expires=1770111999&x-signature=WCj8b6bIDDXNWAoSAL3jTYjchnw%3D)
App13:09![[Web]62 reset和checkout本质](http://p3-sign.bdxiguaimg.com/tos-cn-i-0004/649d503be64644e19b42a3a7da54abfd~tplv-pk90l89vgd-crop-center:576:324.jpeg?appId=3586&biz_tag=list_custom%2Fnone&channelId=0&customType=custom%2Fnone&from=704_middle_image&imageType=list&isImmersiveScene=0&is_ios=1&is_stream=0&lk3s=9d3f5bff&logId=20250203174638DC87DAF949F098A88D57&requestFrom=704&version_code=80402&x-expires=1770111999&x-signature=x1jMP%2BBQwsfoKmhLn2nwQodonzk%3D)
App16:15![[Web]63 git存储及操作](http://p26-sign.bdxiguaimg.com/tos-cn-i-0004/f3bb9e6243ff4c15a798819d15c70371~tplv-pk90l89vgd-crop-center:576:324.jpeg?appId=3586&biz_tag=list_custom%2Fnone&channelId=0&customType=custom%2Fnone&from=704_middle_image&imageType=list&isImmersiveScene=0&is_ios=1&is_stream=0&lk3s=9d3f5bff&logId=20250203174638DC87DAF949F098A88D57&requestFrom=704&version_code=80402&x-expires=1770111999&x-signature=4SnpAix%2B47%2FGBSomy1F6j2hCKkM%3D)
App12:20![[Web]64 rease变基操作](http://p3-sign.bdxiguaimg.com/tos-cn-i-0004/8cea3588a5244beb8c84b10cf07b0045~tplv-pk90l89vgd-crop-center:576:324.jpeg?appId=3586&biz_tag=list_custom%2Fnone&channelId=0&customType=custom%2Fnone&from=704_middle_image&imageType=list&isImmersiveScene=0&is_ios=1&is_stream=0&lk3s=9d3f5bff&logId=20250203174638DC87DAF949F098A88D57&requestFrom=704&version_code=80402&x-expires=1770111999&x-signature=3oYxZoyVzYMqOMjUiq1jURUECGU%3D)
App12:25![[Web]65 配置及分布式版本控制的概念](http://p3-sign.bdxiguaimg.com/tos-cn-i-0004/903735c0317a41b7a7f16580a4b1ecb3~tplv-pk90l89vgd-crop-center:576:324.jpeg?appId=3586&biz_tag=list_custom%2Fnone&channelId=0&customType=custom%2Fnone&from=704_middle_image&imageType=list&isImmersiveScene=0&is_ios=1&is_stream=0&lk3s=9d3f5bff&logId=20250203174638DC87DAF949F098A88D57&requestFrom=704&version_code=80402&x-expires=1770111999&x-signature=2PafULG%2BNQUy51qtM4Eo8%2FcBjzQ%3D)
App16:44![[Web]67 远程仓库命令](http://p3-sign.bdxiguaimg.com/tos-cn-i-0004/37ead711c1f0444a8ef5742efd5cf30d~tplv-pk90l89vgd-crop-center:576:324.jpeg?appId=3586&biz_tag=list_custom%2Fnone&channelId=0&customType=custom%2Fnone&from=704_middle_image&imageType=list&isImmersiveScene=0&is_ios=1&is_stream=0&lk3s=9d3f5bff&logId=20250203174638DC87DAF949F098A88D57&requestFrom=704&version_code=80402&x-expires=1770111999&x-signature=RY8i9%2BZR79AVsWr0jf4U2t0Acjw%3D)
App12:36![[Web]68 ssh及编辑器命令行使用](http://p3-sign.bdxiguaimg.com/tos-cn-i-0004/44924f8a57f94353a911d92403816782~tplv-pk90l89vgd-crop-center:576:324.jpeg?appId=3586&biz_tag=list_custom%2Fnone&channelId=0&customType=custom%2Fnone&from=704_middle_image&imageType=list&isImmersiveScene=0&is_ios=1&is_stream=0&lk3s=9d3f5bff&logId=20250203174638DC87DAF949F098A88D57&requestFrom=704&version_code=80402&x-expires=1770111999&x-signature=vylGguytv7whGHLe4yZwqPFeGGY%3D)
App06:22![[Web]69.1 git](http://p3-sign.bdxiguaimg.com/tos-cn-i-0004/0e24f9996ab54cc8b3cac8e3d100200f~tplv-pk90l89vgd-crop-center:576:324.jpeg?appId=3586&biz_tag=list_custom%2Fnone&channelId=0&customType=custom%2Fnone&from=704_middle_image&imageType=list&isImmersiveScene=0&is_ios=1&is_stream=0&lk3s=9d3f5bff&logId=20250203174638DC87DAF949F098A88D57&requestFrom=704&version_code=80402&x-expires=1770111999&x-signature=5Vv3x3SLNQxtUPqTRDt5bAw7teU%3D)
App15:00![[Web]71 服务端和客户端](http://p26-sign.bdxiguaimg.com/tos-cn-i-0004/9d679214e24944278d8b21863cfe1b3d~tplv-pk90l89vgd-crop-center:576:324.jpeg?appId=3586&biz_tag=list_custom%2Fnone&channelId=0&customType=custom%2Fnone&from=704_middle_image&imageType=list&isImmersiveScene=0&is_ios=1&is_stream=0&lk3s=9d3f5bff&logId=20250203174638DC87DAF949F098A88D57&requestFrom=704&version_code=80402&x-expires=1770111999&x-signature=Mafd%2F%2BNdijvZRxya5iKJucCD7YU%3D)
App14:28![[Web]72 node中的模块化](http://p3-sign.bdxiguaimg.com/tos-cn-i-0004/c417a3e1baf644729d4dc831c700dc86~tplv-pk90l89vgd-crop-center:576:324.jpeg?appId=3586&biz_tag=list_custom%2Fnone&channelId=0&customType=custom%2Fnone&from=704_middle_image&imageType=list&isImmersiveScene=0&is_ios=1&is_stream=0&lk3s=9d3f5bff&logId=20250203174638DC87DAF949F098A88D57&requestFrom=704&version_code=80402&x-expires=1770111999&x-signature=UEIZJzmyU7GwabOOCrOCVWtf%2FyQ%3D)
App16:42![[Web]73 node中的node-modules](http://p26-sign.bdxiguaimg.com/tos-cn-i-0004/257241649e454a89af009559f72e9393~tplv-pk90l89vgd-crop-center:576:324.jpeg?appId=3586&biz_tag=list_custom%2Fnone&channelId=0&customType=custom%2Fnone&from=704_middle_image&imageType=list&isImmersiveScene=0&is_ios=1&is_stream=0&lk3s=9d3f5bff&logId=20250203174638DC87DAF949F098A88D57&requestFrom=704&version_code=80402&x-expires=1770111999&x-signature=YMAzbxzH54FhmSPh3sl3BsSaDtI%3D)
App06:13![[Web]75 npm的常用指令](http://p3-sign.bdxiguaimg.com/tos-cn-i-0004/0a4c6e7dc09e470782f2c677ee861ddd~tplv-pk90l89vgd-crop-center:576:324.jpeg?appId=3586&biz_tag=list_custom%2Fnone&channelId=0&customType=custom%2Fnone&from=704_middle_image&imageType=list&isImmersiveScene=0&is_ios=1&is_stream=0&lk3s=9d3f5bff&logId=20250203174638DC87DAF949F098A88D57&requestFrom=704&version_code=80402&x-expires=1770111999&x-signature=Qh1nWPG4ckVnZkgq%2FXFBEz2BXIA%3D)
App14:37![[Web]76 fs文件操作](http://p3-sign.bdxiguaimg.com/tos-cn-i-0004/ae8b7d47550d489f9335879abfe296d1~tplv-pk90l89vgd-crop-center:576:324.jpeg?appId=3586&biz_tag=list_custom%2Fnone&channelId=0&customType=custom%2Fnone&from=704_middle_image&imageType=list&isImmersiveScene=0&is_ios=1&is_stream=0&lk3s=9d3f5bff&logId=20250203174638DC87DAF949F098A88D57&requestFrom=704&version_code=80402&x-expires=1770111999&x-signature=YZfhCClh%2BQ0kJusOB3SXgADqLSc%3D)
App20:00![[Web]79 buffer](http://p26-sign.bdxiguaimg.com/tos-cn-i-0004/26a32f09b4f345a08f923d2f5749530b~tplv-pk90l89vgd-crop-center:576:324.jpeg?appId=3586&biz_tag=list_custom%2Fnone&channelId=0&customType=custom%2Fnone&from=704_middle_image&imageType=list&isImmersiveScene=0&is_ios=1&is_stream=0&lk3s=9d3f5bff&logId=20250203174638DC87DAF949F098A88D57&requestFrom=704&version_code=80402&x-expires=1770111999&x-signature=spArVAknQzvo884PBZvsvkrQ6ss%3D)
App11:02![[Web]81.0 nodejs-1](http://p3-sign.bdxiguaimg.com/tos-cn-i-0004/7ca45aa73fab4d02a11fb9d67aff91a9~tplv-pk90l89vgd-crop-center:576:324.jpeg?appId=3586&biz_tag=list_custom%2Fnone&channelId=0&customType=custom%2Fnone&from=704_middle_image&imageType=list&isImmersiveScene=0&is_ios=1&is_stream=0&lk3s=9d3f5bff&logId=20250203174638DC87DAF949F098A88D57&requestFrom=704&version_code=80402&x-expires=1770111999&x-signature=LVawntZo2Q5L8Stjj84meYosEVs%3D)
App23:13![[Web]81.1 nodejs-1](http://p3-sign.bdxiguaimg.com/tos-cn-i-0004/f8b1e80495e1477db5f92a9641d9497e~tplv-pk90l89vgd-crop-center:576:324.jpeg?appId=3586&biz_tag=list_custom%2Fnone&channelId=0&customType=custom%2Fnone&from=704_middle_image&imageType=list&isImmersiveScene=0&is_ios=1&is_stream=0&lk3s=9d3f5bff&logId=20250203174638DC87DAF949F098A88D57&requestFrom=704&version_code=80402&x-expires=1770111999&x-signature=MbickKg%2B1C0XvYXmWHJTFbBISBk%3D)
App15:54![[Web]81.2 nodejs-1](http://p3-sign.bdxiguaimg.com/tos-cn-i-0004/9d013aa7de91439f91b3e2999f5dc1f6~tplv-pk90l89vgd-crop-center:576:324.jpeg?appId=3586&biz_tag=list_custom%2Fnone&channelId=0&customType=custom%2Fnone&from=704_middle_image&imageType=list&isImmersiveScene=0&is_ios=1&is_stream=0&lk3s=9d3f5bff&logId=20250203174638DC87DAF949F098A88D57&requestFrom=704&version_code=80402&x-expires=1770111999&x-signature=4O3SAvFN1c0XQZ5tMBqzmVL81Ak%3D)
App15:28![[Web]82.0 nodejs-2](http://p26-sign.bdxiguaimg.com/tos-cn-i-0004/98f10f15456a4cd4b18e50a865a2f5b5~tplv-pk90l89vgd-crop-center:576:324.jpeg?appId=3586&biz_tag=list_custom%2Fnone&channelId=0&customType=custom%2Fnone&from=704_middle_image&imageType=list&isImmersiveScene=0&is_ios=1&is_stream=0&lk3s=9d3f5bff&logId=20250203174638DC87DAF949F098A88D57&requestFrom=704&version_code=80402&x-expires=1770111999&x-signature=roPy4ORajHrm0gLcT0ck%2Fxjthfw%3D)
App15:48![[Web]82.4 nodejs-2](http://p26-sign.bdxiguaimg.com/tos-cn-i-0004/0c171ce26ecc45b0b727386d90dc32c6~tplv-pk90l89vgd-crop-center:576:324.jpeg?appId=3586&biz_tag=list_custom%2Fnone&channelId=0&customType=custom%2Fnone&from=704_middle_image&imageType=list&isImmersiveScene=0&is_ios=1&is_stream=0&lk3s=9d3f5bff&logId=20250203174638DC87DAF949F098A88D57&requestFrom=704&version_code=80402&x-expires=1770111999&x-signature=sQjXedSKBxHsqMSkmMgZ2ohqWEQ%3D)
App27:52![[Web]83 pug模板引擎上](http://p3-sign.bdxiguaimg.com/tos-cn-i-0004/e22dedac453f4e7d8a533b7a7a129545~tplv-pk90l89vgd-crop-center:576:324.jpeg?appId=3586&biz_tag=list_custom%2Fnone&channelId=0&customType=custom%2Fnone&from=704_middle_image&imageType=list&isImmersiveScene=0&is_ios=1&is_stream=0&lk3s=9d3f5bff&logId=20250203174638DC87DAF949F098A88D57&requestFrom=704&version_code=80402&x-expires=1770111999&x-signature=QhZFk7onhnkVQZ9JYHT5CDfVEEA%3D)
App14:18![[Web]87.0 nodejs-3](http://p26-sign.bdxiguaimg.com/tos-cn-i-0004/240731b6677a41a9ab9c03c0479757c5~tplv-pk90l89vgd-crop-center:576:324.jpeg?appId=3586&biz_tag=list_custom%2Fnone&channelId=0&customType=custom%2Fnone&from=704_middle_image&imageType=list&isImmersiveScene=0&is_ios=1&is_stream=0&lk3s=9d3f5bff&logId=20250203174638DC87DAF949F098A88D57&requestFrom=704&version_code=80402&x-expires=1770111999&x-signature=aZnxfLcq1szaSJr915hgPJoZs%2Bw%3D)
App14:11![[Web]87.2 nodejs-3](http://p3-sign.bdxiguaimg.com/tos-cn-i-0004/27d8b0b4dc5b4d9fbaa3fbf4fc2b69b8~tplv-pk90l89vgd-crop-center:576:324.jpeg?appId=3586&biz_tag=list_custom%2Fnone&channelId=0&customType=custom%2Fnone&from=704_middle_image&imageType=list&isImmersiveScene=0&is_ios=1&is_stream=0&lk3s=9d3f5bff&logId=20250203174638DC87DAF949F098A88D57&requestFrom=704&version_code=80402&x-expires=1770111999&x-signature=zq%2B%2Fv0OGw4I1yEgKhxutLhGUoK0%3D)
App29:53![[Web]87.3 nodejs-3](http://p3-sign.bdxiguaimg.com/tos-cn-i-0004/28ccbca0a2974cfc92417bd1742ec4ed~tplv-pk90l89vgd-crop-center:576:324.jpeg?appId=3586&biz_tag=list_custom%2Fnone&channelId=0&customType=custom%2Fnone&from=704_middle_image&imageType=list&isImmersiveScene=0&is_ios=1&is_stream=0&lk3s=9d3f5bff&logId=20250203174638DC87DAF949F098A88D57&requestFrom=704&version_code=80402&x-expires=1770111999&x-signature=s9xunN2R8cWgr9JQhBs1v1v5iSo%3D)
App22:59![[Web]87.5 nodejs-3](http://p3-sign.bdxiguaimg.com/tos-cn-i-0004/f7be746d2be44540a7e517bc1b1a9f50~tplv-pk90l89vgd-crop-center:576:324.jpeg?appId=3586&biz_tag=list_custom%2Fnone&channelId=0&customType=custom%2Fnone&from=704_middle_image&imageType=list&isImmersiveScene=0&is_ios=1&is_stream=0&lk3s=9d3f5bff&logId=20250203174638DC87DAF949F098A88D57&requestFrom=704&version_code=80402&x-expires=1770111999&x-signature=wNSs%2BCvU5y90pZ5j%2ByTJG0nN0zU%3D)
App22:24![[Web]90.2 nodejs-4](http://p3-sign.bdxiguaimg.com/tos-cn-i-0004/ad8c433b5af34af1abba8e8cc87deb20~tplv-pk90l89vgd-crop-center:576:324.jpeg?appId=3586&biz_tag=list_custom%2Fnone&channelId=0&customType=custom%2Fnone&from=704_middle_image&imageType=list&isImmersiveScene=0&is_ios=1&is_stream=0&lk3s=9d3f5bff&logId=20250203174638DC87DAF949F098A88D57&requestFrom=704&version_code=80402&x-expires=1770111999&x-signature=WK7i9eSKA9wLFVUm07NkD3PbFKM%3D)
App41:06![[Web]90.4 nodejs-4](http://p26-sign.bdxiguaimg.com/tos-cn-i-0004/44e5138cdec3401fb73c362d3af3a28d~tplv-pk90l89vgd-crop-center:576:324.jpeg?appId=3586&biz_tag=list_custom%2Fnone&channelId=0&customType=custom%2Fnone&from=704_middle_image&imageType=list&isImmersiveScene=0&is_ios=1&is_stream=0&lk3s=9d3f5bff&logId=20250203174638DC87DAF949F098A88D57&requestFrom=704&version_code=80402&x-expires=1770111999&x-signature=yLagCw5IRIhxQMs9%2FFfxkK%2FJNCc%3D)
App16:40![[Web]91.0 nodejs - 5](http://p3-sign.bdxiguaimg.com/tos-cn-i-0004/dd991d3eb7d2436cbac0b52350e5b5c1~tplv-pk90l89vgd-crop-center:576:324.jpeg?appId=3586&biz_tag=list_custom%2Fnone&channelId=0&customType=custom%2Fnone&from=704_middle_image&imageType=list&isImmersiveScene=0&is_ios=1&is_stream=0&lk3s=9d3f5bff&logId=20250203174638DC87DAF949F098A88D57&requestFrom=704&version_code=80402&x-expires=1770111999&x-signature=qbBzhIdVn5FMlIibLuywi1ZuqAQ%3D)
App33:03![[Web]91.4 nodejs - 5](http://p3-sign.bdxiguaimg.com/tos-cn-i-0004/5a1d55010b944757891c0bf991bfeed5~tplv-pk90l89vgd-crop-center:576:324.jpeg?appId=3586&biz_tag=list_custom%2Fnone&channelId=0&customType=custom%2Fnone&from=704_middle_image&imageType=list&isImmersiveScene=0&is_ios=1&is_stream=0&lk3s=9d3f5bff&logId=20250203174638DC87DAF949F098A88D57&requestFrom=704&version_code=80402&x-expires=1770111999&x-signature=zLjbkYkijMXwePPNcia5BcNxdBI%3D)
App33:24![[Web]92 如何验证用户名](http://p3-sign.bdxiguaimg.com/tos-cn-i-0004/5736ae205bce4b53894070905eee9af0~tplv-pk90l89vgd-crop-center:576:324.jpeg?appId=3586&biz_tag=list_custom%2Fnone&channelId=0&customType=custom%2Fnone&from=704_middle_image&imageType=list&isImmersiveScene=0&is_ios=1&is_stream=0&lk3s=9d3f5bff&logId=20250203174638DC87DAF949F098A88D57&requestFrom=704&version_code=80402&x-expires=1770111999&x-signature=YbbUQs635Vo4ZHBRHSm8xYOZsjU%3D)
App11:10打开App观看
