大网数据广告活动
Linux 与通用命令

git-imerge · 常用命令示例

· 52CE 我爱测

Perform a merge or rebase between two Git branches incrementally. > Conflicts between branches are tracked down to pairs of individual commits, to simplify conflict resolution. > More information: <https://github.com/mhagger/git-imerge>.

git imerge

Perform a merge or rebase between two Git branches incrementally. Conflicts between branches are tracked down to pairs of individual commits, to simplify conflict resolution. More information: https://github.com/mhagger/git-imerge.

  • Start imerge-based rebase (check out the branch to be rebased, first):

git imerge rebase

  • Start imerge-based merge (check out the branch to merge into, first):

git imerge merge

  • Show ASCII diagram of in-progress merge or rebase:

git imerge diagram

  • Continue imerge operation after resolving conflicts (git add the conflicted files, first):

git imerge continue --no-edit

  • Wrap up imerge operation, after all conflicts are resolved:

git imerge finish

  • Abort imerge operation, and return to the previous branch:

git imerge remove && git checkout

来源:tldr-pages contributors · 作者与贡献记录 · CC BY 4.0。离线整理了版式、链接和媒体显示。

资料来源与适用范围

资料来源
tldr-pages contributors
适用范围
请按文中版本与环境说明核对
内容语言
中文;命令、路径和错误标识保留技术原文
本地收录日期
2026-11-15
授权说明
CC BY 4.0

正文与所需资源由本站本地存储。查看来源及更新记录 ↗

请按适用版本和实际日志确认原因;本站没有对每一种系统或设备逐项执行文中的操作。