diff --git a/lua/avante/sidebar.lua b/lua/avante/sidebar.lua index 25c9c65..29b3bcf 100644 --- a/lua/avante/sidebar.lua +++ b/lua/avante/sidebar.lua @@ -462,6 +462,10 @@ local function insert_conflict_contents(bufnr, snippets) for _, snippet in ipairs(snippets) do local start_line, end_line = unpack(snippet.range) + if start_line > end_line then + start_line = start_line + 1 + end_line = end_line + 1 + end local need_prepend_indentation = false local start_line_indentation = ""