b2evolution Announcementstag:launchpad.net,2007-06-26:/b2evolution/+announcementshttps://launchpad.net/@@/product-logohttps://launchpad.net/@@/product2009-12-07T21:11:30.291844+00:00"whissip" development branch has been rebased (new ancestor)2009-12-07T21:11:30.291844+00:002009-12-07T21:11:30.172139+00:00tag:launchpad.net,2009-12-07:/+announcement/4529Daniel Hahlerhttps://launchpad.net/~blueyed<p>Until recently, the "trunk" branch (CVS mirror) has been provided by myself, using tailor.<br/>
Due to bugs and problems with this, I've switched back to the VCS import feature provided by Launchpad.<br/>
Unfortunately, this meant that the ancestor of "whissip" was something completely different to "bzr" (although the contents of the files is / should be the same).</p>
<p>So, when merging your branch with the "rebased" whissip branch, you'll get conflicts for all files that you've changed or added in your branch.</p>
<p>Here's some help to get this resolved, if you need it: <a href="https://answers.launchpad.net/bzr/+question/92794/+index" rel="nofollow">https:/<wbr/>/answers.<wbr/>launchpad.<wbr/>net/bzr/<wbr/>+question/<wbr/>92794/+<wbr/>index</a></p>