BASE and THIS files

[Martin Pool]

On 8 March 2010 02:23, Dmitri Pissarenko <dmitri.pissarenko at gmail.com> wrote:
> 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?

Hi Dmitri,

Typically you will have three files, BASE, THIS and OTHER.

THIS is the file that was previously in the working tree.  OTHER was
in the tree you're merging in.  BASE is Bazaar's best suggestion for
the common ancestor between them: a version of this file that has
previously existed in both branches.

In your case if you merge from the parent into the child, OTHER will
be from the parent and THIS from the child branch.


-- 
Martin <http://launchpad.net/~mbp/>