rebase

Compare original and translation side by side

🇺🇸

Original

English

🇨🇳

Chinese

Rebase the current branch onto the latest

origin/main

将当前分支Rebase到最新的

origin/main

分支。

When asked to rebase:

Check current state:
bash
```
git status
git branch --show-current
```
- If on
```
main
```
  , warn the user and stop — rebasing main onto itself is a no-op
- If there are uncommitted changes, warn the user and stop — do NOT stash automatically
Fetch latest:
bash
```
git fetch origin
```
Rebase onto main:
bash
```
git rebase origin/main
```
Handle conflicts:
- If the rebase succeeds cleanly, proceed to step 5
- If there are conflicts:
  - List the conflicting files
  - Ask the user how they want to proceed: resolve manually, or abort
  - Do NOT force-continue or blindly resolve conflicts
  - To abort:
```
git rebase --abort
```
Confirm — Print a summary:
text
```
Rebased feat/123-add-watch-mode onto origin/main
```
- Do NOT push automatically
- If the user explicitly asks to push, use
```
git push --force-with-lease
```
- NEVER use
```
--force
```
  — always
```
--force-with-lease
```
  for safety

当需要执行Rebase操作时：

检查当前状态:
bash
```
git status
git branch --show-current
```
- 如果当前在
```
main
```
  分支，警告用户并停止——将main分支Rebase到自身无意义
- 如果存在未提交的变更，警告用户并停止——不要自动执行stash
拉取最新代码:
bash
```
git fetch origin
```
Rebase到main分支:
bash
```
git rebase origin/main
```
处理冲突:
- 如果Rebase顺利完成，进入步骤5
- 如果存在冲突:
  - 列出冲突文件
  - 询问用户如何处理：手动解决，还是终止Rebase
  - 不要强制继续或盲目解决冲突
  - 终止命令：
```
git rebase --abort
```
确认操作 —— 打印总结信息:
text
```
Rebased feat/123-add-watch-mode onto origin/main
```
- 不要自动推送
- 如果用户明确要求推送，使用
```
git push --force-with-lease
```
- 绝对不要使用
  --force
  —— 为了安全，始终使用
```
--force-with-lease
```