<![CDATA[阿Tim日志]]> https://atim.cn/index.php zh-cn https://atim.cn/post// <![CDATA[回滚代码]]> bkkkd <partybase@gmail.com> Fri, 28 Apr 2023 05:54:36 +0000 https://atim.cn/post//
1.在本地的开发副本中,查看需要回溯的分支

git log

commit dc2f72f51522665980e474013dfc577a7a6fb054 (HEAD -> 6.0, origin/HEAD, origin/6.0)
Merge: f96be7b dcd39c8
Author: thinkphp <thinkphp@qq.com>
Date:   Tue May 31 12:54:26 2022 +0800

    Merge branch '6.0' of github.com:top-think/think into 6.0

commit f96be7b7ede70f5c52aa32d5616eb08a0b252b95
Author: thinkphp <thinkphp@qq.com>
Date:   Tue May 31 12:53:51 2022 +0800

    去除腾讯统计




2. 复制提交码(commit后的代码),并强制切换到该 版本

git reset --hard f96be7b7ede70f5c52aa32d5616eb08a0b252b95

3. 强制更新到远程的分支

git push -f -u origin master

4. 然后到服务端的的副本,新代码切换回到最新

git pull
git reset origin/master
git checkout -- .
git clean -fd

服务端的副本即可还原到原来的版本.后面需要再合并到代码到master也不会受到影响
]]> https://atim.cn/post//#blogcomment <![CDATA[[评论] 回滚代码]]> <user@domain.com> Thu, 01 Jan 1970 00:00:00 +0000 https://atim.cn/post//#blogcomment