How to merge trunk conflicts safely in bzr (bazaar.canonical.com/)

Sadly, the openstack community currently uses bzr instead of git. Instead of rebasing, this is the process by which I have to deal with tree conflicts “safely”?

bzr branch lp:trunk_project merge_temp_dir
cd merge_temp_dir && bzr merge ../your_original_branch
vi path_to_the_conflicted_files #and make your merges
bzr resolved
bzr commit -m "resolving commits."
bzr push --overwrite lp~myusername/path/to/my/branch

I hate this. And I’m storing it here so I can reference it in the future.

Also read...

Comments


  1. function bzr_rebase {
    head=$1
    curr=$(pwd)
    merge_dir="merge_${curr##*/}"

    cd ..

    bzr branch $head $merge_dir
    if [ $? -ne 0 ]; then
    echo "Something went wrong, you should fix that shit"
    exit
    fi

    cd $merge_dir
    bzr merge $curr
    }

  2. I am not sure where you are getting your info, but good topic.
    I needs to spend some time learning more or understanding more.

    Thanks for great info I was looking for this info for my mission.

    my blog post The Simpsons Tapped Out Hack Android (Forest)

Leave a Reply

Your email address will not be published. Required fields are marked *

You may use these HTML tags and attributes: <a href="" title=""> <abbr title=""> <acronym title=""> <b> <blockquote cite=""> <cite> <code> <del datetime=""> <em> <i> <q cite=""> <strike> <strong>