search

martinvonz / jj

A Git-compatible VCS that is both simple and powerful
https://martinvonz.github.io/jj/
Apache License 2.0
7.24k stars 240 forks source link

conflicts: insert trailing newline when materializing conflicts #3977

Open ilyagr opened 6 days ago

ilyagr commented 6 days ago

This happens for non-empty files only; the materialization code can handle files and hunks with 0 or more lines, but each line should terminate in a newline.

This is an imperfect fix to https://github.com/martinvonz/jj/issues/3968, a better fix is TODO; see https://github.com/martinvonz/jj/issues/3975.

Checklist

If applicable: