Subject: Re: [PATCH 19/20] merge-ort: add implementation of record_conflicted_index_entries()

From: Ævar Arnfjörð Bjarmason <[email-masked]>
Date: Sun, 29 Nov 2020 11:20:46 +0100

On Sun, Nov 29 2020, Elijah Newren via GitGitGadget wrote:

> +		if (pos < 0) {
> +			if (ci->filemask == 1)
> +				cache_tree_invalidate_path(index, path);
> +			else
> +				BUG("Conflicted %s but nothing in basic working tree or index; this shouldn't happen", path);

Trivial style comment: elsewhere in the series you avoid indentation
with BUG(...). Would be better here as:

    if (x != 1)
        BUG(...)
    rest_of_code();