From: Junio C Hamano <junkio@cox.net>
To: Linus Torvalds <torvalds@osdl.org>
Cc: git@vger.kernel.org
Subject: Re: Necessity of "evil" merge and topic branches
Date: Wed, 17 May 2006 23:44:15 -0700 [thread overview]
Message-ID: <7vu07n6dds.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <7vy7wz6e8c.fsf@assigned-by-dhcp.cox.net> (Junio C. Hamano's message of "Wed, 17 May 2006 23:25:55 -0700")
Junio C Hamano <junkio@cox.net> writes:
> Now, unlike "pu", I never rewind "next", so once I did this
> "evil merge", I do not have to worry about this anymore while
> the topic is still on "next".
Side note. If an evil merge or other hand resolution needs to
be done on a path that results in automerge conflicts, rerere
often helps. I really should start advertising it a bit more.
Unfortunatly, rerere does not even kick in in this case.
prev parent reply other threads:[~2006-05-18 6:44 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-05-18 4:21 Remove old "git-add.sh" remnants Linus Torvalds
2006-05-18 6:25 ` Necessity of "evil" merge and topic branches Junio C Hamano
2006-05-18 6:44 ` Junio C Hamano [this message]
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=7vu07n6dds.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=git@vger.kernel.org \
--cc=torvalds@osdl.org \
/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