Hi James,
thanks for bringing this up (again)! Last Sunday I actualy started documenting
the use of rebase when
applying mere-requests: http://wiki.flightgear.org/Git#Merge_requests Would be
nice if you (and others,
like our Git-pro AndersG) could extend/correct it ;)
In the "new" git rules w
On 14 Dec 2011, at 09:32, Anders Gidenstam wrote:
> If your topic is freshly rebased it will just be a fast-forward merge,
> that is, your new commits are just added to the history of master.
> Nice and linear IMHO.. :)
Yes, sorry, I didn't express that clearly at all - thanks Anders!
James
On Wed, 14 Dec 2011, James Turner wrote:
> Of course, when you do finally merge your topic into next, that's a
> merge - because we do all care about recording that action in the
> history.
If your topic is freshly rebased it will just be a fast-forward merge,
that is, your new commits are jus
A note for people committing code:
Please don't *ever* merge from next to a topic / local branch, and then merge
that branch back to the public next. Doing so makes the history much more
confusing than it needs to be. Rebase your local topic branches onto next
periodically when you wish to 'syn
4 matches
Mail list logo
