git pull --rebase origin master
You check out the experiment branch, and then rebase it onto the master branch as follows:
$ git checkout experiment
$ git rebase master
This operation works by going to the common ancestor of the two branches (the one you’re on and the one you’re rebasing onto), getting the diff introduced by each commit of the branch you’re on, saving those diffs to temporary files, resetting the current branch to the same commit as the branch you are rebasing onto, and finally applying each change in turn.
At this point, you can go back to the master branch and do a fast-forward merge.
$ git checkout master
$ git merge experiment
There is no difference in the end product of the integration, but rebasing makes for a cleaner history. If you examine the log of a rebased branch, it looks like a linear history: it appears that all the work happened in series, even when it originally happened in parallel.
You can remove the test branch because all the work is integrated and you don’t need them anymore.
$ git branch -d test-branch
While developing your application, you'll soon notice that you end up with many files with the same name.
The simplest solution would be to add each file's functional role to the file name, so
a feature controller file will be named feature.controller.js, a feature model
file will be named feature.model.js, and so on. However, things get even more
complicated when you consider the fact that MEAN applications use JavaScript
MVC files for both the Express and AngularJS applications. This means that you'll
often have two files with the same name; for instance, a feature.controller.js
file might be an Express controller or an AngularJS controller. To solve this issue, it
is also recommended that you extend files names with their execution destination.
A simple approach would be to name our Express controller feature.server.
controller.js and our AngularJS controller feature.client.controller.js.
This might seem like overkill at first, but you'll soon discover that it's quite helpful to
quickly identify the role and execution destination of your application files.