On Mon, 9 Feb 2009, David Berry wrote:
>>> The commands in step 6) have to be done quickly to minimise the chance
>>> of anyone else pushing new stuff to master in the middle of it all.
>>>
>>> 6) git checkout master # Go back to the master branch
>>> git pull # Get any changes made whilst
>>> I've been fixing the bug
>>> git checkout bug-fix # Go back to the bug-fix branch
>>> git rebase master # Modify the bug-fix changes so that
>>> they can be applied to the current master HEAD
>>> git checkout master # Go back to master
>>
>> you can insert a git pull at this point just to make sure that no new
>> patches have arrived.
>
> Except if new patches were pulled here, my bug-fix changes would no
> longer be re-based at HEAD correctly.
git pull --rebase
>> if you don't feel like you are commit worthy you can use git-stash at this
>> point.
>
> Since the ast-stcs and bug-fix stuff each have their own working
> directory, a stash wouldn't be needed would it? That is, I'm about to
> change directory, so my current edits wont get changed.
ok. I was thinking in terms of a single checkout.
> The git-new-workdir approach seems to be working. I don't suppose I
> should say this, but it gives the whole system a bit more of an SVN
> feel to it...
:-)
--
Tim Jenness
JAC software
http://www.jach.hawaii.edu/~timj
|