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

problem with cherry picking

From
JDJohn Dlugosz <jdlugosz@tradestation.com>
Date
Apr 20, 2009, 20:07 UTC
Message-ID
<450196A1AAAE4B42A00A8B27A59278E70ACE0021@EXCHANGE.trad.tradestation.com>

Someone at work here jumped the gun and committed something before fetching an amended branch. Typical stuff -- now his work and the repo's work diverged. His change was purely new files, no big deal. In gitk, reset his dev to origin/remote/dev, then cherry-pick his new commit.

But it barfed all over the place. One problem was read-only files. But even after purging those, it had the same complaint, something about untracked file would be modified. What's the deal here?

I talked him through accomplishing it another way -- reset hard back to his new commit, reset mixed to the proper ancestor, and re-doing the commit.

But I want to understand what the issue is here.
--John
TradeStation Group, Inc. is a publicly-traded holding company (NASDAQ GS: TRAD) of three operating subsidiaries, TradeStation Securities, Inc. (Member NYSE, FINRA, SIPC and NFA), TradeStation Technologies, Inc., a trading software and subscription company, and TradeStation Europe Limited, a United Kingdom, FSA-authorized introducing brokerage firm. None of these companies provides trading or investment advice, recommendations or endorsements of any kind. The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon, this information by persons or entities other than the intended recipient is prohibited.
  If you received this in error, please contact the sender and delete the material from any computer.
Next: Andreas Ericsson
Message 1 of 2 in “problem with cherry picking”
  1. John DlugoszApr 20, 2009
  2. Andreas EricssonApr 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.