openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

Can't merge !

[18:42][tim@tigger2] openlp_website $cd trunk/
/home/tim/Projects/openlp_website/trunk
[18:42][tim@tigger2] trunk $bzr update
Tree is up to date at revision 28 of branch bzr+ssh://bazaar.launchpad.net/+branch/openlp/website                                                                          
[18:43][tim@tigger2] trunk $bzr merge lp:~tomasgroth/openlp/doc-faq-trouble
bzr: ERROR: Branches have no common ancestor, and no merge base revision was specified.                                                                                    
[18:45][tim@tigger2] trunk $pwd
/home/tim/Projects/openlp_website/trunk
[18:45][tim@tigger2] trunk $cd ..
[18:45][tim@tigger2] openlp_website $rm -r trunk
[18:45][tim@tigger2] openlp_website $bzr checkout lp:openlp/website trunk
[18:48][tim@tigger2] openlp_website $cd trunk                                                                                                                              
/home/tim/Projects/openlp_website/trunk
[18:48][tim@tigger2] trunk $bzr merge lp:~tomasgroth/openlp/doc-faq-trouble
bzr: ERROR: Branches have no common ancestor, and no merge base revision was specified.                                                                                    
[18:51][tim@tigger2] trunk $

-- 
https://code.launchpad.net/~tomasgroth/openlp/doc-faq-trouble/+merge/279665
Your team OpenLP Core is subscribed to branch lp:openlp/documentation.