From 4abae80b7fbea37ae0c1c66f4eb58d6dfe5799a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=97=E8=A7=85?= Date: Wed, 8 Apr 2026 10:00:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0git=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 1bab957..eb17ae7 100644 --- a/README.md +++ b/README.md @@ -14,4 +14,9 @@ - git checkout main #切换到 main 分支 - git merge dev #令将分支dev合并到 main 分支 - git merge --continue #解决合并冲突(如果需要) -- git add . && git push origin main # 正常更新main分支到线上 \ No newline at end of file +- git add . && git push profile main # 正常更新main分支到线上 + +### 远程文件强制覆盖本地 +- git fetch profile +- git checkout your-branch-name # 确保你在正确的分支上 +- git reset --hard profile/your-branch-name # git reset --hard profile/master