Comment 2 for bug 557098
Revision history for this message
| Andrew Bennetts (spiv) wrote Re: Merging the trunk into a branch causes spurious conflicts (CVS merges better than bzr) | #2 |
© 2004
Canonical Ltd.
•
Terms of use
•
Data privacy
•
Contact Launchpad Support
•
Blog
•
Careers
•
System status
•
bbfa235
(Get the code!)
Also, you say you're:
> trying to "upgrade" from one branch of Bugzilla to a newer branch
What do you mean by "upgrade"? Do you want to integrate the changes from both branches into a single branch, or just switch to using the new branch? i.e. perhaps you want "bzr switch" rather than "bzr merge"?