0

我会有一个合并冲突，比如

<<<<<<<HEAD
    ("experimental", "use_sell_signal", False),
    ("experimental", "sell_profit_only", True),
    ("experimental", "ignore_roi_if_buy_signal", True),
=======
    ("experimental", "use_exit_signal", False),
    ("experimental", "exit_profit_only", True),
    ("experimental", "ignore_roi_if_enter_signal", True),
>>>>>>> 98f08047d(Strategy added short methods and changed names)

当我保存时，autopep8 将其格式化为看起来像，然后不再检测到合并冲突

<< << << < HEAD
    ("experimental", "use_sell_signal", False),
    ("experimental", "sell_profit_only", True),
    ("experimental", "ignore_roi_if_buy_signal", True),
    == == == =
    ("experimental", "use_exit_signal", False),
    ("experimental", "exit_profit_only", True),
    ("experimental", "ignore_roi_if_enter_signal", True),
    >>>>>> > 98f08047d(Strategy added short methods and changed names)

这显然很烦人，如何在不关闭保存格式的情况下禁用它

4

0 回答 0