Building Enterprise JavaScript Applications

Merging branches

We have developed our Facebook and Twitter login features on two separate sub-feature branches; how can we get these changes back onto the master branch? Following the Driessen Model, we must merge the two sub-feature branches onto the main feature branch, then merge the feature branch into the dev branch, and then create a release branch off dev and merge that release branch into master.

To get started, let's merge the social-login/facebook branch into the social-login/main branch using git merge:

$ git checkout social-login/main$ git merge social-login/facebookUpdating 8d9f102..09bc8acFast-forward social-login.txt | 1 + 1 file changed, 1 insertion(+)

Git will attempt to automatically merge the changes from the social-login/facebook ...