得到了一个令人困惑的git错误消息 [英] Got a confusing git error message

问题描述

收到以下网上似乎不常见的消息:

Got the following message which doesn't seem to be common online:

fatal: unknown style 'diff' given for 'merge.conflictstyle'

我已经查找了merge.conflictstyle和diff的样式，并且diff3似乎是合适的.我不确定该在哪里/应该更改此位置，但是由于分支后面，它不允许我进行任何更改，因为上述:(.

I have looked up styles for merge.conflictstyle and diff, and diff3 seem to be appropriate. I'm not sure where I can/should change this, but it's not allowing me to push any changes, as the branch is behind, because I can't pull due to the message above :(.

推荐答案

尝试运行

$ git config merge.conflictstyle diff3

看看是否可行.

问题是您的配置选项不正确.该命令会将其更改为正确的值diff3.

The issue is that you have an incorrect config option. That command will change it to the correct value, diff3.

这篇关于得到了一个令人困惑的git错误消息的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！