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

retrospective move

From
Jjemmyw <jeremy@boost.co.nz>
Date
Feb 4, 2009, 08:43 UTC
Message-ID
<21826423.post@talk.nabble.com>

Hi. Awhile ago I copied some files in my local repo then commited. In another commit I deleted the original files, so essentially I did a mv that git doesn't know about. Now I'm trying to merge from another branch where changes have happened to the files in their original locations, and it's making the merge somewhat difficult. Is there a way to ease this?

-- 
View this message in context: http://www.nabble.com/retrospective-move-tp21826423p21826423.html
Sent from the git mailing list archive at Nabble.com.
Next: Thomas Rast
Message 1 of 5 in “retrospective move”
  1. jemmywFeb 4, 2009
  2. Thomas RastFeb 4, 2009
  3. Santi BéjarFeb 4, 2009
  4. Thomas RastFeb 4, 2009
  5. Santi BéjarFeb 4, 2009

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.