目前，您只能手工解决冲突。然而。如果您描述了您要解决的原始问题，则可能有一种方法可以解决那个而无需重新设置基准。

At this point, you're stuck with resolving conflicts by hand, unfortunately. However. if you describe the original problem you're trying to solve, there may be a way to fix that without a rebase.