Re: Git questions

[David Kastrup]

Phil Holmes <address@hidden> writes:

> I'm updating master with LSR changes.  I followed the CG, which says to run
> a local LSR update, then one from the LSR itself.  I think when I've done
> this in the past, I created a commit from each run, then pushed both commits
> in one go.  This time I've pushed the local update to staging, then run the
> LSR update against master.  When I try to apply this update to
> origin/staging, it fails, presumably because it's attempting to make the
> same change twice.

Possibly.

> There's lots of ways I can get round this: the simplest is to let
> master update from staging then re-run the LSR update.  However, I was
> wondering if I can avoid doing this.

You can just run the LSR update on the state you pushed to staging.

> One option would appear to be to checkout origin/staging and then
> checkout the previous commit.  This would effectively remove my first
> commit, and I can apply my later patch.  Does this have any bad
> effects?

Well, you can't push this to staging afterwards since it is no longer
strictly ahead of staging: it sidestepped one commit.

> Is there a better way?

See above.

-- 
David Kastrup