On Tue, Oct 8, 2024, at 22:44, Junio C Hamano wrote:
> Kristoffer Haugsbakk <code@xxxxxxxxxxxxxxx> writes:
>
>> - NEWTREE=$(git merge-tree --write-tree $BRANCH1 $BRANCH2)
>> - test $? -eq 0 || die "There were conflicts..."
>> + NEWTREE=$(git merge-tree --write-tree $BRANCH1 $BRANCH2) || {
>> + echo "There were conflicts..." 1>&2
>> + exit 1
>> + }
>
> Makes sense. Was there a particular reason why these two patches
> had to be done in two separate steps?
>
> Looking good otherwise. Thanks.
Just my usual do-one-thing-per-commit.
In this case a simple Also-paragraph can connect the two. So squashing
them is fine too.
--
Kristoffer Haugsbakk
kristofferhaugsbakk@xxxxxxxxxxxx
