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.