On 12/22/11 6:15 PM, Karthik Kambatla wrote:
A quick question related to the workflow. (Might not apply to the ticket,
hence posting on the dev-list)
Case: I submit a patch for S4-33 , and need to use that code to address
S4-36.
Flow: Create a branch for S4-36 off of S4-33. At some point, either my
patch or someone else's patch to S4-33 will be committed (hopefully).
Rebase S4-36 at that point over dev and submit patch for S4-36 once done.
Is this flow safe or can it lead to unwarranted issues because of the
rebasing post commit?
Interesting but tricky question!
But I think it boils down to: you'll have to make sure that you rebase
only your own changes related to S4-36, so that you don't "rewrite
(integrated) history"!
from http://progit.org/book/ch3-6.html : If you treat rebasing as a way
to clean up and work with commits before you push them, and if you only
rebase commits that have never been available publicly, then you’ll be fine.
Matthieu
