Take the 2-minute tour ×
Super User is a question and answer site for computer enthusiasts and power users. It's 100% free, no registration required.

I have two branches with the following files in there:

branch a:

file_a
file_b
file_c

branch b:

file_a
file_d
file_e

I want to merge them, so that I get both files from a and b (and files that exist in both should normally be merged)! is that possbile?

share|improve this question
    
Why don't you simply get both branches and merge them manually? –  Ramhound Sep 27 '11 at 16:48
    
clone two times and copy and add? –  reox Sep 27 '11 at 16:55
    
You migt want to ask this over on StackOverflow... programmers over there might know more about this stuff. –  cwheeler33 Sep 27 '11 at 18:32

1 Answer 1

up vote 6 down vote accepted

this might help: http://book.git-scm.com/3_basic_branching_and_merging.html

in your case you would do the following:

  • git checkout a (you will switch to branch a)
  • git merge b (this will merge all changes from branch b into branch a)
  • git commit -a (this will commit your changes)

take a look at above link to get the full picture.

another very useful resource is this:

and especially regarding your question:

share|improve this answer

Your Answer

 
discard

By posting your answer, you agree to the privacy policy and terms of service.

Not the answer you're looking for? Browse other questions tagged or ask your own question.