hmmm tried to do that last night, but something went left of field. I now have a branch thats up to date with imageworks/master but the commits are in the future.. doesn't really matter as I'm hoping to roll all the photoshop commits into one as their was a lot of unnecessary code in my initial commit.
toggle quoted messageShow quoted text
On 19/01/2011, at 5:08 AM, Jeremy Selan wrote:
That's no problem at all.
FYI, this really easy to solve with the 'rebase' command. Say you
have a branch and you want to incorporate all changes on spi/master.
(I've already setup the spi remote, I am including my .git/config file
as an example. copy the 'spi' remote if you'd like).
git fetch --all (to get all branches up to date locally)
gitk --all (to visually inspect the commit tree)
git checkout photoshop (your branch name)If everything works, your new commits will be 'replayed' upon the
git rebase spi/master
latest spi/master tree, bringing you up to date. If the rebase
doesn't work, you can always revert back with git rebase --abort.
On Mon, Jan 17, 2011 at 4:36 PM, Malcolm Humphreys
Whoops, I should live by that mantra 'update or die'. I have a few
too many different checkouts of ocio, still a bit in svn land, goto to
get used to using local git branches.
This fixed this issue as well. :)