[Openstack] [OpenStack][Nova] Issues with "run_tests.sh", no tests are run when "import libvirt is present"
Jay Pipes
jaypipes at gmail.com
Mon Jul 2 13:08:04 UTC 2012
On 07/02/2012 08:57 AM, Leander Bessa Beernaert wrote:
> I'm developing on custom branch and haven't updated the repository for
> at least 3 weeks.
> Do i fetch the lastest changes like this:
>
> git remote update
> git checkout master
> git pull origin master
>
> git checkout <branch>
>
> git pull master
Remember to git stash your current working changes first...
# Ensure you are in your local working git branch
# (not your local master)
git stash --all
git checkout master
git pull
git checkout $WORKINGBRANCH
git rebase master
git stash pop
and then handle any merge conflicts that may pop up.
Best,
-jay
More information about the Openstack
mailing list