BASE and THIS files

[Dmitri Pissarenko]

Hello!

When I merge branches (i. e. I have a parent branch and a child branch
and then I transfer changes from parent to the child) and Bazaar finds
conflicts, for each file with conflicts 2 files are generated - one
with BASE and one with THIS extension.

I assume that one of them is the file of the parent branch and the
other in the child branch. Is this true?

If yes, which of them is BASE and which of them is THIS?

Thanks in advance

Dmitri