# How to move a big branches to a new base? 4 messages from 2010-02-26 to 2010-03-04. Participants: Lin Mac, John Tapsell. Thread: https://gitlist.dev/t/22828 ## Lin Mac, 2010-02-26 03:18 Subject: How to move a big branches to a new base? Message-ID: <10d816431002251918vf13a5e8uf0396aa861081bcc@mail.gmail.com> URL: https://gitlist.dev/e/10d816431002251918vf13a5e8uf0396aa861081bcc%40mail.gmail.com ``` Hi, I have a branch that have about 10 descendent branches. Now I would like to move this branch, and all the descendent branches, to a new base, and I might need to do so quiet frequently before I merge it to master branch. My "dirty" way is to rebase step by step, it takes about 15-20 rebases, but the branches is somehow complicated, and this seems error-prone to me. Is there a more clean way to do so? Thanks in advance. Best Regards, Mac Lin ``` ## Lin Mac, 2010-03-03 03:17 Subject: Re: How to move a big branches to a new base? Message-ID: <10d816431003021917p54491088ie290ec47840dfaa2@mail.gmail.com> URL: https://gitlist.dev/e/10d816431003021917p54491088ie290ec47840dfaa2%40mail.gmail.com In-Reply-To: <10d816431002251918vf13a5e8uf0396aa861081bcc@mail.gmail.com> ``` Hi, Sorry for re-send this again, for this is really important to me and trouble me a lot. And I've been searching for a long time, but I didn't found any useful. Or maybe it's the way I uses branch wrong? Should I always keep a branch as clean as possible, and use tag for some unused/not often used branch, to avoid such problem? Also I doubt whether my last mail reach the mailing list or not. So, any response welcome, even RTFM (I'm actually reading it....) is fine, at least let me know it's just a stupid question..... Best Regards, Mac Lin 2010/2/26 Lin Mac : > Hi, > > I have a branch that have about 10 descendent branches. Now I would > like to move this branch, and all the descendent branches, to a new > base, and I might need to do so quiet frequently before I merge it to > master branch. > > My "dirty" way is to rebase step by step, it takes about 15-20 > rebases, but the branches is somehow complicated, and this seems > error-prone to me. > > Is there a more clean way to do so? > > Thanks in advance. > > Best Regards, > Mac Lin > ``` ## John Tapsell, 2010-03-03 03:54 Subject: Re: How to move a big branches to a new base? Message-ID: <43d8ce651003021954o1411efd2i1a1f26e9b8ed5d54@mail.gmail.com> URL: https://gitlist.dev/e/43d8ce651003021954o1411efd2i1a1f26e9b8ed5d54%40mail.gmail.com In-Reply-To: <10d816431002251918vf13a5e8uf0396aa861081bcc@mail.gmail.com> ``` On 26 February 2010 03:18, Lin Mac wrote: > Hi, > > I have a branch that have about 10 descendent branches. Now I would > like to move this branch, and all the descendent branches, to a new > base, and I might need to do so quiet frequently before I merge it to > master branch. I tend to keep my branches as small as possible - a few commits at most. And avoid merges like the plague. This seems to work pretty well. Remember you can squash your commits together to keep the branches clean and well-ordered. John ``` ## Lin Mac, 2010-03-04 09:34 Subject: Re: How to move a big branches to a new base? Message-ID: <10d816431003040134j103c567if10aacf0fa10701f@mail.gmail.com> URL: https://gitlist.dev/e/10d816431003040134j103c567if10aacf0fa10701f%40mail.gmail.com In-Reply-To: <43d8ce651003021954o1411efd2i1a1f26e9b8ed5d54@mail.gmail.com> ``` 2010/3/3 John Tapsell : > I tend to keep my branches as small as possible - a few commits at > most.  And avoid merges like the plague.  This seems to work pretty > well. > Remember you can squash your commits together to keep the branches > clean and well-ordered. squash is a powerful tools, but doens't help much in this situation. In other word, one have to prevent a branch to becoming a tree. Does it worth to have a new tool for such situation? Best Regard, Mac Lin ```