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 _______________________________________________ Mailing list: https://launchpad.net/~openstack Post to : openstack@lists.launchpad.net Unsubscribe : https://launchpad.net/~openstack More help : https://help.launchpad.net/ListHelp
