Hi Martin, thanks for the quick response! I tried this: bzr merge -r 3..2 . This resulted in the changed files being marked as having conflicts. If I run a bzr status just before performing the merge it shows that I do not have any uncommitted changes. Is there a way to not have to resolve the conflicted files? Thanks! Eric <div class="gmail_quote">On Thu, Apr 30, 2009 at 5:21 PM, Martin Pool <<a href="mailto:mbp@sourcefrog.net">mbp@sourcefrog.net</a>> wrote: <blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">2009/5/1 Eric Berry <<a href="mailto:elberry@gmail.com">elberry@gmail.com</a>>: <div class="im">> I looked at the help documentation for the merge command, and it looks like > I can do a merge from the higher revision to the lower revision, is this > correct? I also found this bug report > (<a href="https://bugs.launchpad.net/bzr/+bug/152008" target="_blank">https://bugs.launchpad.net/bzr/+bug/152008</a>), but the steps there looked > much more complicated. > > Is the high to low revision merge the correct way to do this? </div>That's correct. -- Martin <<a href="http://launchpad.net/%7Embp/" target="_blank">http://launchpad.net/~mbp/</a>> </blockquote></div> -- Learn from the past. Live in the present. Plan for the future. 11101000 <a href="http://www.townsfolkdesigns.com/blogs/elberry">http://www.townsfolkdesigns.com/blogs/elberry</a>