53
15
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?
Why don't you simply get both branches and merge them manually? – Ramhound – 2011-09-27T16:48:25.693
clone two times and copy and add? – reox – 2011-09-27T16:55:30.237
3You migt want to ask this over on StackOverflow... programmers over there might know more about this stuff. – cwheeler33 – 2011-09-27T18:32:58.923