Unable to merge
I created a test repository (A) with a couple of files in it then created a branch (B) from it using the Eclipse plugin Team -> Branch command. If I modify a file in B and commit it then I am able to call Team -> Merge on A to get the modification into A. However if I modify a file in A and commit it then when I call Team -> Merge on B I don't even get the "Remote location Dialog" box and nothing happens ! I am able to do the merge using the "bzr merge" command from the command line. Is this a bug or is there something I am doing incorrectly ?
I am working with Eclipse Gannymede 3.4.1 (for C/C++), Bazaar 1.7rc2 and version 1.1.1 of the bzr-eclipse plugin.
Question information
- Language:
- English Edit question
- Status:
- Answered
- Assignee:
- No assignee Edit question
- Last query:
- Last reply:
Can you help with this problem?
Provide an answer of your own, or ask Eric for more information if necessary.