{"thread":{"id":"20058","subject":"branch vs. cherry-pick workflow","startedAt":"2009-07-08T20:51:38Z","lastAt":"2009-07-08T22:59:38Z","messageCount":2,"participants":["jshalvi","Sitaram Chamarty"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"117634","messageId":"24399128.post@talk.nabble.com","threadId":"20058","inReplyTo":null,"subject":"branch vs. cherry-pick workflow","fromName":"jshalvi","fromEmail":"jshalvi@gmail.com","sentAt":"2009-07-08T20:51:38Z","receivedAt":"2009-07-08T20:51:38Z","isPatch":false,"sender":{"key":"jshalvi@gmail.com","avatar":null},"body":"\nour team recently switched over to git, and for months I've been happily\ndeveloping on branches (as in one branch per work product/bug) and\nsubmitting those branches to our project lead to merge.\n\nNow I'm the one that has to do the merges, and I've learned that all the\nother developers simply develop on their own main branch, and the project\nlead cherry picks commits off each developer's main branch.  Except for\nmine, of course, which he just has to merge.  They've even gone so far as to\nput the bug number in the commit message so the project lead knows which\ncommit to cherry pick.\n\nAm I crazy to think this is ass-backwards?\n\nIt seems dangerous to rely on cherry-picking like this.  Are there any good\ntechnical reasons to insist on a branch/merge workflow as opposed to this\ncommit/cherry-pick workflow?  It may sound like a simple question, but\neveryone seems happy doing it this way... I really don't feel like trying to\nconvince developers to wear their shirts right-side-out when wearing them\ninside-out gets the job done just as well for them ;)\n\nThanks for any insight\n-- \nView this message in context: http://www.nabble.com/branch-vs.-cherry-pick-workflow-tp24399128p24399128.html\nSent from the git mailing list archive at Nabble.com.\n"},{"id":"117640","messageId":"slrnh5a96q.95d.sitaramc@sitaramc.homelinux.net","threadId":"20058","inReplyTo":"24399128.post@talk.nabble.com","subject":"Re: branch vs. cherry-pick workflow","fromName":"Sitaram Chamarty","fromEmail":"sitaramc@gmail.com","sentAt":"2009-07-08T22:59:38Z","receivedAt":"2009-07-08T22:59:38Z","isPatch":false,"sender":{"key":"sitaramc@gmail.com","avatar":"https://avatars.githubusercontent.com/u/43316?v=4"},"body":"On 2009-07-08 20:51:38, jshalvi <jshalvi@gmail.com> wrote:\n> It seems dangerous to rely on cherry-picking like this.  Are there any good\n> technical reasons to insist on a branch/merge workflow as opposed to this\n> commit/cherry-pick workflow?  It may sound like a simple question, but\n\nman git-workflows and look at the section \"MANAGING\nBRANCHES\" gives a very nice, though brief, overview of why\nbranching is better in general.\n\nRegards,\n\nSitaram\n"}]}