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

branch vs. cherry-pick workflow

From
Jjshalvi <jshalvi@gmail.com>
Date
Jul 8, 2009, 20:51 UTC
Message-ID
<24399128.post@talk.nabble.com>

our team recently switched over to git, and for months I've been happily developing on branches (as in one branch per work product/bug) and submitting those branches to our project lead to merge.

Now I'm the one that has to do the merges, and I've learned that all the other developers simply develop on their own main branch, and the project lead cherry picks commits off each developer's main branch. Except for mine, of course, which he just has to merge. They've even gone so far as to put the bug number in the commit message so the project lead knows which commit to cherry pick.

Am I crazy to think this is ass-backwards?

It seems dangerous to rely on cherry-picking like this. Are there any good technical reasons to insist on a branch/merge workflow as opposed to this commit/cherry-pick workflow? It may sound like a simple question, but everyone seems happy doing it this way... I really don't feel like trying to convince developers to wear their shirts right-side-out when wearing them inside-out gets the job done just as well for them ;)

Thanks for any insight
-- 
View this message in context: http://www.nabble.com/branch-vs.-cherry-pick-workflow-tp24399128p24399128.html
Sent from the git mailing list archive at Nabble.com.
Next: Sitaram Chamarty
Message 1 of 2 in “branch vs. cherry-pick workflow”
  1. jshalviJul 8, 2009
  2. Sitaram ChamartyJul 8, 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.