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

files deleted with no record?

From
JSJeremy Scott <jeremy@great-scotts.org>
Date
Jun 24, 2014, 01:15 UTC
Message-ID
<CAFDwLfyXrUZUUuaciAjamn-cXJ6mAv_D41zLwT4AZE=cmAX7rg@mail.gmail.com>

I just encountered a situation where a merge was made, with no apparent changes in files (ie no log), but the result was that some files were deleted.

person A adds some files person B adds some files from the same point person B commits and pushes. person A commits -- now merge is required a few more commits on top of person B's commit person A merges - this removes the files that B added. There is no log of the files being deleted

Clearly this is possible - was this a user error?
Thanks
Next: Phil Hord
Message 1 of 5 in “files deleted with no record?”
  1. Jeremy ScottJun 24, 2014
  2. Phil HordJun 26, 2014
  3. Philip OakleyJun 26, 2014
  4. Jeremy ScottJun 26, 2014
  5. Jeremy ScottJun 26, 2014

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.