Hi Ayush On 08/07/2025 16:47, Ayush Chandekar wrote:
Now that we're planning to get rid of the 'auto' keyword from commentChar [1], do you think it would be better if we just ignored the keyword when we detect conflict comments? Also, how is it that a user will end up having lines starting with the character being the same as the conflict comment's character?
Let see if Junio agrees with depreciation and removing support for commentChar=auto first. If we do deprecate it then we should still support it until it is removed so I'm leaning towards fixing the config parsing to reset comment_line_char to '#' instead.
Thanks Phillip
