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.
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
}
There is a plugin to Bazaar that handles this problem for you.
“Rewrite” install that and you can do a
bzr rebase
similar to Git rebase i think.
Find a description here: http://wiki.bazaar.canonical.com/Rewrite
code : https://launchpad.net/bzr-rewrite
Ubuntu: apt-get install bzr-rebase
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)