How can I merge two branches without losing any files?

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?

3

1 Answer

this might help:

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.

0

Your Answer

Sign up or log in

Sign up using Google Sign up using Facebook Sign up using Email and Password Submit

Post as a guest

Post Your Answer Discard

By clicking “Post Your Answer”, you agree to our terms of service, privacy policy and cookie policy