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

Re: How to create & switch to a branch after changes have already been made?

From
PDPatrick Doyle <wpdster@gmail.com>
Date
Jul 3, 2007, 02:49 UTC
Message-ID
<e2a1d0aa0707021949k181f9042j26ebd124f61ca1ae@mail.gmail.com>
In-Reply-To
<e2a1d0aa0707021918mb335856j278b3128203a793a@mail.gmail.com>

Hmmm... One thing I might tell the hypothetical person is to temporarily delete or rename the new version of "somefile", so that the merge could complete with problems, and then recreate or rename it back. That would probably allow the hypothetical person to continue his/her work.

--wpd
Previous: Patrick DoyleNext: Johannes Schindelin
Message 2 of 4 in “How to create & switch to a branch after changes have already been made?”
  1. Patrick DoyleJul 3, 2007
  2. Patrick DoyleJul 3, 2007
  3. Johannes SchindelinJul 3, 2007
  4. Patrick DoyleJul 3, 2007

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.