No BASE file generated

Asked by Michael J. Vinca

We are doing a merge of two branches and have a lot of conflicts. The odd part is, however, that with every conflict only *.THIS and *.OTHER files are created. *.BASE is not created. As such, merging becomes difficult. Can anybody explain to me what may be going on or what I may be doing wrong?

Question information

Language:
English Edit question
Status:
Solved
For:
Bazaar Edit question
Assignee:
No assignee Edit question
Solved by:
Martin Pool
Solved:
Last query:
Last reply:
Revision history for this message
Best Martin Pool (mbp) said :
#1

This may be happening because the files were added independently on the two branches (or Bazaar thinks that they were), and it can't find a common base between them. After you commit the initial merge of these files, bzr will be able to find a merge base and it shouldn't happen again.

Revision history for this message
Michael J. Vinca (michaelj) said :
#2

Thanks Martin Pool, that solved my question.