Hello,

if by tedious you mean resolve the same merge conflict multiple times, then
rerere[1] may solve your problem.

If you want to go the way you described, you will have to implement some
client side hooks, which cherry pick your new commits on another branch.
This, however, may introduce merge conflicts; I don't know how hooks
tolerate this.

Best,
Gergely

[1] http://git-scm.com/blog/2010/03/08/rerere.html

On 2 Apr 2015 02:37, "Peng Yu" <pengyu...@gmail.com> wrote:
>
> Hi,
>
> One practice of using git to have one feature per branch.
>
> Let's say a developer has worked on many small features in many
> branches. Then he sends one pull request to the central (not
> controlled by him) for each feature he has developed. While he is
> waiting for all the features be merged into the central repository, he
> needs to use all these feature locally.
>
> To do so, he may need to merge the changes in these branches to his
> local master branch. But this can be tedious when he has many
> branches.
>
> Is there a way to somehow setup a branch so whenever something is
> committed to the branch, the changes will also be simultaneously
> committed to the local master branch? By this way, the develop can
> avoid having to merge changes from many branches.
>
> --
> Regards,
> Peng
>
> --
> You received this message because you are subscribed to the Google Groups
"Git for human beings" group.
> To unsubscribe from this group and stop receiving emails from it, send an
email to git-users+unsubscr...@googlegroups.com.
> For more options, visit https://groups.google.com/d/optout.

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to