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

Re: How to commit changes if remote repository changed directory structure?

From
Jeff King <peff@peff.net>
Date
Mar 20, 2009, 07:13 UTC
Message-ID
<20090320071319.GF27008@coredump.intra.peff.net>
In-Reply-To
<7vljr04qnw.fsf@gitster.siamese.dyndns.org>
On Fri, Mar 20, 2009 at 12:08:51AM -0700, Junio C Hamano wrote:
Show 5 quoted lines
> > First, commit your changes. Then merge the other developer's changes. :)
> 
> We should probably point out to new people that "first commit and then
> worry about merges after your changes are safely committed" is always how
> people would "go about" anything.
Yes, absolutely.

Most of the current documentation focuses on being a reference to particular commands or tasks. But this is more of a "philosophy of working with git" item. I guess it should go in the user manual somewhere. Cc'ing Bruce, who may have some comments.

-Peff
Previous: Junio C HamanoNext: J. Bruce Fields
Message 4 of 5 in “How to commit changes if remote repository changed directory structure?”
  1. andholtMar 20, 2009
  2. Jeff KingMar 20, 2009
  3. Junio C HamanoMar 20, 2009
  4. Jeff KingMar 20, 2009
  5. J. Bruce FieldsMar 20, 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.