{"thread":{"id":"22828","subject":"How to move a big branches to a new base?","startedAt":"2010-02-26T03:18:28Z","lastAt":"2010-03-04T09:34:12Z","messageCount":4,"participants":["Lin Mac","John Tapsell"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"135717","messageId":"10d816431002251918vf13a5e8uf0396aa861081bcc@mail.gmail.com","threadId":"22828","inReplyTo":null,"subject":"How to move a big branches to a new base?","fromName":"Lin Mac","fromEmail":"mkl0301@gmail.com","sentAt":"2010-02-26T03:18:28Z","receivedAt":"2010-02-26T03:18:28Z","isPatch":false,"sender":{"key":"mkl0301@gmail.com","avatar":null},"body":"Hi,\n\nI have a branch that have about 10 descendent branches. Now I would\nlike to move this branch, and all the descendent branches, to a new\nbase, and I might need to do so quiet frequently before I merge it to\nmaster branch.\n\nMy \"dirty\" way is to rebase step by step, it takes about 15-20\nrebases, but the branches is somehow complicated, and this seems\nerror-prone to me.\n\nIs there a more clean way to do so?\n\nThanks in advance.\n\nBest Regards,\nMac Lin\n"},{"id":"136056","messageId":"10d816431003021917p54491088ie290ec47840dfaa2@mail.gmail.com","threadId":"22828","inReplyTo":"10d816431002251918vf13a5e8uf0396aa861081bcc@mail.gmail.com","subject":"Re: How to move a big branches to a new base?","fromName":"Lin Mac","fromEmail":"mkl0301@gmail.com","sentAt":"2010-03-03T03:17:38Z","receivedAt":"2010-03-03T03:17:38Z","isPatch":false,"sender":{"key":"mkl0301@gmail.com","avatar":null},"body":"Hi,\n\nSorry for re-send this again, for this is really important to me and\ntrouble me a lot. And I've been searching for a long time, but I\ndidn't found any useful.\n\nOr maybe it's the way I uses branch wrong? Should I always keep a\nbranch as clean as possible, and use tag for some unused/not often\nused branch, to avoid such problem?\n\nAlso I doubt whether my last mail reach the mailing list or not.\nSo, any response welcome, even RTFM (I'm actually reading it....) is\nfine, at least let me know it's just a stupid question.....\n\nBest Regards,\nMac Lin\n\n2010/2/26 Lin Mac <mkl0301@gmail.com>:\n> Hi,\n>\n> I have a branch that have about 10 descendent branches. Now I would\n> like to move this branch, and all the descendent branches, to a new\n> base, and I might need to do so quiet frequently before I merge it to\n> master branch.\n>\n> My \"dirty\" way is to rebase step by step, it takes about 15-20\n> rebases, but the branches is somehow complicated, and this seems\n> error-prone to me.\n>\n> Is there a more clean way to do so?\n>\n> Thanks in advance.\n>\n> Best Regards,\n> Mac Lin\n>\n"},{"id":"136058","messageId":"43d8ce651003021954o1411efd2i1a1f26e9b8ed5d54@mail.gmail.com","threadId":"22828","inReplyTo":"10d816431002251918vf13a5e8uf0396aa861081bcc@mail.gmail.com","subject":"Re: How to move a big branches to a new base?","fromName":"John Tapsell","fromEmail":"johnflux@gmail.com","sentAt":"2010-03-03T03:54:23Z","receivedAt":"2010-03-03T03:54:23Z","isPatch":false,"sender":{"key":"johnflux@gmail.com","avatar":"https://gravatar.com/avatar/25f70d4c0f96396b84a2e34bcd9bdc233462c7b4be29b5fdca8266fc53f30b0c?d=mp&s=160"},"body":"On 26 February 2010 03:18, Lin Mac <mkl0301@gmail.com> wrote:\n> Hi,\n>\n> I have a branch that have about 10 descendent branches. Now I would\n> like to move this branch, and all the descendent branches, to a new\n> base, and I might need to do so quiet frequently before I merge it to\n> master branch.\n\nI tend to keep my branches as small as possible - a few commits at\nmost.  And avoid merges like the plague.  This seems to work pretty\nwell.\nRemember you can squash your commits together to keep the branches\nclean and well-ordered.\n\nJohn\n"},{"id":"136141","messageId":"10d816431003040134j103c567if10aacf0fa10701f@mail.gmail.com","threadId":"22828","inReplyTo":"43d8ce651003021954o1411efd2i1a1f26e9b8ed5d54@mail.gmail.com","subject":"Re: How to move a big branches to a new base?","fromName":"Lin Mac","fromEmail":"mkl0301@gmail.com","sentAt":"2010-03-04T09:34:12Z","receivedAt":"2010-03-04T09:34:12Z","isPatch":false,"sender":{"key":"mkl0301@gmail.com","avatar":null},"body":"2010/3/3 John Tapsell <johnflux@gmail.com>:\n> I tend to keep my branches as small as possible - a few commits at\n> most.  And avoid merges like the plague.  This seems to work pretty\n> well.\n> Remember you can squash your commits together to keep the branches\n> clean and well-ordered.\nsquash is a powerful tools, but doens't help much in this situation.\n\nIn other word, one have to prevent a branch to becoming a tree.\nDoes it worth to have a new tool for such situation?\n\nBest Regard,\nMac Lin\n"}]}