ansaurus

Question

Merging changes from master into all branches using Git?

Answer 1

+1 A:

One possibility (not tested myself) would be:

to establish a bare repo where you can push your master branch.
have a post-receive hook (see githooks man page) on that bare repo which will then push master on every "feature" repo you want
have a post-receive hook per feature repo to begin:
- a rebase of your feature branch on top of master (fine if you did not yet pushed your feature branch elsewhere)
- or a merge of master on your feature branch.

You will still need to get to your feature repo and check if the rebase or merge is not blocked due to some merge conflicts.

VonC 2010-02-24 22:07:34

Yes, I will need to manually resolve any merge conflicts. Thanks. I had no idea that hooks even existed. I have some reading to do: http://kernel.org/pub/software/scm/git/docs/githooks.html

carleeto 2010-02-24 22:22:55

@carleeto: good point, I have added the githooks man page link in my answer.

VonC 2010-02-24 22:28:47

@VonC This sounds like you are suggesting multiple repositories instead of multiple branches.

Abizern 2010-02-25 08:37:11

@Abizern: true, my first interpretation of the OP's question was being able to be able to checkout, examine and compile several features *at the same time* (hence the all cloning issue). But I may have misinterpreted the question here.

VonC 2010-02-25 08:47:23

Answer 2

+1 A:

If

the branches which you want to merge the latest master commits into are not published AND
you want all commits in master to be in the other branches

then you could simply rebase them onto master after master has been updated. This little script might work if you're using a Unix shell. It rebases each branch onto master.

for BRANCH in `ls .git/refs/heads`; do git rebase master $BRANCH; done

Frerich Raabe 2010-02-25 11:30:07

ansaurus

tags:

views:

answers:

Merging changes from master into all branches using Git?

related questions