Re: Why is it bad to rewind a branch that has already been pushed out?
- From
- Andy Parkins <andyparkins@gmail.com>
- Date
- Feb 4, 2007, 18:01 UTC
- Message-ID
- <200702041801.31110.andyparkins@gmail.com>
- In-Reply-To
- <7vy7nf3u5m.fsf@assigned-by-dhcp.cox.net>
On Saturday 2007, February 03 19:42, Junio C Hamano wrote:
> Actually, if you are assuming a, h, and j are unrelated, then > the merge done by Alice will _not_ revert 'j', so the history > will perfectly be fine. The merge result will have a half-baked > work done with 'j', and everybody can build on top of.
Absolutely true.
Your point is a strong one. I think I'm still not thinking big enough with the distributed development concept. Your point has made me consider that I've been overly concerned about not rebasing pushed commits. Provided you're willing to correct conflicts in a merge; they aren't as bad as I initially thought - in fact they offer a further choice when creating project history.
Thanks Junio.
Andy
-- Dr Andrew Parkins, M Eng (Hons), AMIEE andyparkins@gmail.com