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:
To post a message you must log in.