[git-users] How to automatically merge changes from many branches?

2015-04-01 Thread Peng Yu
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

Re: [git-users] How to automatically merge changes from many branches?

2015-04-01 Thread Gergely Polonkai
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