SourceTree-重新设置-合并期间的错误 [英] SourceTree - rebase - Errors During Merge

问题描述

我正在尝试做一些简单的事情，例如编辑上一次提交的提交消息.

I'm trying to do something simple like editing the commit message for a previous commit.

检查git status我有:

nothing to commit, working directory clean

然后我单击提交并执行SourceTree>存储库> Interactive Rebase ...

I then click on the commit and do SourceTree > Repository > Interactive Rebase...

但是得到此对话框以及一个完全空白/空的描述区域:

but get this dialog box, and a completely blank/empty description area:

注意:我读到某个地方，这可能是由于FileMerge创建.orig备份文件所致.但是，查看FileMerge首选项后，我看不到有关备份文件的任何信息

Note: I read somewhere that this might be due to FileMerge creating a .orig backup file. However, looking through FileMerge preferences I don't see anything about backup files

推荐答案

问题是，这实际上并不是在SourceTree中进行交互式变基的方式.我知道这是一个非常令人困惑的界面... 不要选择Sourcetree> Repository> Interactive Rebase.而是，在父提交上按 Control键并单击，然后从上下文菜单中选择"为子级重新设置".

The problem is that that's not actually how you do an interactive rebase in SourceTree. I know it's a terribly confusing interface... Do not choose Sourcetree > Repository > Interactive Rebase. Rather, Control-click on the parent commit and choose — from the contextual menu — Rebase children.

这篇关于SourceTree-重新设置-合并期间的错误的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！