Paul McCullagh <[email protected]> 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. _______________________________________________ Mailing list: https://launchpad.net/~maria-developers Post to : [email protected] Unsubscribe : https://launchpad.net/~maria-developers More help : https://help.launchpad.net/ListHelp
