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)
git rebase spi/master

If everything works, your new commits will be 'replayed' upon the
latest spi/master tree, bringing you up to date. If the rebase
doesn't work, you can always revert back with git rebase --abort.

-- Jeremy

On Mon, Jan 17, 2011 at 4:36 PM, Malcolm Humphreys
<malcolmh...@...> wrote:

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. :)

.malcolm