git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Big Mess--How to use Git to resolve

From
NKNeal Kreitzinger <nkreitzinger@gmail.com>
Date
Dec 21, 2011, 23:06 UTC
Message-ID
<4EF2667F.9020600@gmail.com>
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

Previous: Holger HellmuthNext: Neal Kreitzinger
Message 5 of 7 in “Big Mess--How to use Git to resolve”
  1. hs_glwDec 17, 2011
  2. Randal L. SchwartzDec 17, 2011
  3. hs_glwDec 17, 2011
  4. Holger HellmuthDec 19, 2011
  5. Neal KreitzingerDec 21, 2011
  6. Neal KreitzingerDec 21, 2011
  7. Seth RobertsonDec 21, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.