Git merging feature 1 and feature 2

mzh · 06-08-2012, 02:42 AM

Dear Linux users
I have a conceptual problem getting this:
say in Git I have a working Master, and a branch dev_button1. Now I

git checkout master (back on master)
git checkout -b dev_button2 (i want to implement another button)

so I have three branches. I implement button2 and merge it with master and continue with button1. But then, button 2 is not in dev_button1, and once I finish that and merge it with master, I will loose button2, no?

Thanks for any hints.

pan64 · 06-08-2012, 02:57 AM

I do not really understand your question. Merging means the changes what you have made in branch1 will be integrated into another (master) branch. Merging another branch (branch2) will do similar task: the new code from branch2 will be also integrated into the master branch. You will not loose the result of the previous branch, but they will be merged together.