Code review comment for lp://qastaging/~justin-fathomdb/nova/bug724623

> When you see a file with a .THIS extension, what that means is that you did a
> merge, had a conflict, but failed to do a bzr resolve --all before committing
> and pushing. Normally, bzr catches this kind of thing, but one of two things
> may have happened:
>
> * Justin may be using the git-bzr bridge, in which case the .THIS file may
> have inadvertently been bzr added during the commit/push
> * Justin may have seen files ending in .OTHER, .BASE, and .THIS and deleted
> the .OTHER and .BASE files. bzr uses these 3 files to store what the conflict
> is. The .OTHER branch contains the file in the branch being merged, the .BASE
> contains the file in a branch that is an ancestor to both the current branch
> and the merge branch, and .THIS contains the file in the current branch.
>
> Solution: bzr remove the file with .THIS extension and next time, use bzr
> resolve --all to resolve the conflicts *after* you've resolved the merge
> conflict in the file...
>
> Hope this helps,
>
> -jay

Ahah, thanks Jay!