From: Andy Parkins <andyparkins@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <junkio@cox.net>
Subject: Re: Why is it bad to rewind a branch that has already been pushed out?
Date: Sun, 4 Feb 2007 18:01:29 +0000 [thread overview]
Message-ID: <200702041801.31110.andyparkins@gmail.com> (raw)
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
next prev parent reply other threads:[~2007-02-04 18:04 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-02-03 6:40 Why is it bad to rewind a branch that has already been pushed out? Junio C Hamano
2007-02-03 10:40 ` Andy Parkins
2007-02-03 19:42 ` Junio C Hamano
2007-02-04 18:01 ` Andy Parkins [this message]
2007-02-03 13:20 ` Theodore Tso
2007-02-04 16:16 ` Robin Rosenberg
2007-02-04 20:08 ` Junio C Hamano
[not found] ` <20070205132150.123659@dial-up-mi-449.lombardiacom.it>
2007-02-05 13:27 ` [PATCH] Documentation: add KMail in SubmittingPatches Michael
2007-02-06 3:07 ` Junio C Hamano
2007-02-06 13:45 ` Michael
2007-02-06 14:16 ` Jakub Narebski
2007-02-06 14:47 ` Andy Parkins
-- strict thread matches above, loose matches on Subject: below --
2007-02-03 8:42 Why is it bad to rewind a branch that has already been pushed out? linux
2007-02-03 9:04 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200702041801.31110.andyparkins@gmail.com \
--to=andyparkins@gmail.com \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).