Re: Issue 2100: Explanation of branches for CG (issue 5539062)

[David Kastrup]

Graham Percival <address@hidden> writes:

> On Sun, Jan 15, 2012 at 12:18:57PM +0000, address@hidden wrote:
>> 
>> I think you misunderstand what git rebase does.  git rebase
>> origin/staging does *not* bring origin/staging into dev/cg;
>
> really?  wow, I completely misunderstood that.

If it didn't bring it into dev/cg, what else would it do when dev/cg is
the currently checked out branch (which I assume this is about)?

If it didn't bring origin/staging into dev/cg, how could you then push
the HEAD of dev/cg as a fastforward into origin/staging?

>> If origin/staging is bad, and then deleted, and then built again
>> as a new origin/staging, the developer can get the appropriate
>> set of commits by just reissuing git rebase origin/staging.
>
> ok, sounds great!

Too good to be true.  See comment in the issue.

-- 
David Kastrup