标签：git Author revert Jan 使用 release commit
使用场景:
release分支被其他分支错误的合并完代码之后，又有新分支将代码合并到release，需要去回滚某分支错误的合并请求
1.基于release分支新建一个分支:release-revert
命令:
git checkout release # 切换到 release 分支
git checkout -b release-revert # 创建并切换到 release-revert 分支
2.git log:查看之前提交的代码
展示如下所示:
commit 05d20a6d7f9fa27ce3bcd9fa49e07bbbbcffc107
Merge: bed1411 c12060d
Author: dyh
Date: Tue Jan 30 13:04:17 2024 +0800
Merge branch 'master-ad_update' into 'release'
Master ad update
See merge request jvcloud/business/cloudsee-saas/jvcloud-saas-ums!344
commit bed141142b465910fe26c1f37fb1afea76563f12
Merge: 8434a3d 4298838
Author: dyh
Date: Mon Jan 29 08:34:30 2024 +0800
Merge branch 'nvsee-dev' into 'release'
Nvsee dev
See merge request jvcloud/business/cloudsee-saas/jvcloud-saas-ums!343
commit 4298838f7c4c5c0e56527b5a21d6eecb20f7b406
Author: dyh
Date: Fri Jan 26 17:43:36 2024 +0800
多语言改造:
隐私协议
涉及接口:
/v1/ums/privacy_agreement/info
/v1/ums/get_user_info
commit 43b78671c6c9ee8f6c07b1ced3ae4799504bae67
Author: dyh
Date: Fri Jan 26 16:18:13 2024 +0800
多语言改造: 国家列表中国家名称,在不同的入参语言,返回不同语言的名称
commit 5921802b9c24e983ec53b78ed0f58518d907b0e3 (origin/master-nvsee, master-nvsee)
Author: dyh
Date: Fri Jan 26 11:09:30 2024 +0800
1.三方,权限,语言列表多语言改造
commit b628ff9c308643452321d408e70bc8650a5a3670
Author: dyh
Date: Sat Jan 20 15:47:12 2024 +0800
1.新增接口:
APP获取国家列表,app修改用户语言,APP获取语言列表
|
3.git revert <哈希值> :回滚提交
举例:
(1)基础
git revert bed141142b465910fe26c1f37fb1afea76563f12
可回滚这次提交
(2)进阶使用
回滚连续多次提交
命令: git revert <hash>..<hash>
描述:第一个hash是起始commit哈希值,中间用'..'隔开,第二个commit哈希值是要结束的某次提交,将回滚从起始提交到结束的某次提交
举例:
gi revert b628ff9c308643452321d408e70bc8650a5a3670..bed141142b465910fe26c1f37fb1afea76563f12
标签：git,
Author,
revert,
Jan,
使用,
release,
commit
From： https://blog.csdn.net/Amrdt/article/details/136624870