← Back to team overview

maria-developers team mailing list archive

Re: MariaDB + PBXT


Paul McCullagh <paul.mccullagh@xxxxxxxxxxxxx> writes:

> I must say I find it strange that bzr is merging files with .OTHER
> and .BASE endings, because these are temp files which only occur after
> a merge conflict.

My thinking is that these were accidentally added at some point in the
history, and subsequently removed. And when merging this add+remove, we get
the conflict because the parent directory does not exist in the merge
destination. But I do not know for sure.

 - Kristian.