From: Neal Kreitzinger <nkreitzinger@gmail.com>
To: hs_glw <greg@hra.net>
Cc: git@vger.kernel.org
Subject: Re: Big Mess--How to use Git to resolve
Date: Wed, 21 Dec 2011 17:06:39 -0600 [thread overview]
Message-ID: <4EF2667F.9020600@gmail.com> (raw)
In-Reply-To: <1324147247781-7104493.post@n2.nabble.com>
On 12/17/2011 12:40 PM, hs_glw wrote:
> Randal, thank you for the comprehensive answer.
The technique Randal described sounds like the 'vendor code drop' method
described in the git-rm manpage. There you will find detailed
instructions on the best way to 'erase' the previous version and drop in
a tarball of the 'newer' version.
Hope this helps.
v/r,
neal
next prev parent reply other threads:[~2011-12-21 23:06 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-17 12:32 Big Mess--How to use Git to resolve hs_glw
2011-12-17 15:33 ` Randal L. Schwartz
2011-12-17 18:40 ` hs_glw
2011-12-19 17:04 ` Holger Hellmuth
2011-12-21 23:06 ` Neal Kreitzinger [this message]
2011-12-21 23:44 ` Neal Kreitzinger
2011-12-21 23:56 ` Seth Robertson
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=4EF2667F.9020600@gmail.com \
--to=nkreitzinger@gmail.com \
--cc=git@vger.kernel.org \
--cc=greg@hra.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).