Rebase branches of development

[miguelaferreira]

Whenever we implement something new we make a branch of development, we implement it there and then we merge the new branch back into development.

Git allows for two types of operations for integrating one branch into another. There is the merge and the rebase. The merge basically creates a new commit where the two branches are combined with their first common ancestor. Rebasing replays the changes made in a branch into another. In the end, rebasing makes for a cleaner history.

Please see http://git-scm.com/book/ch3-6.html for more details.

I suggest that form now onwards we rebase all the branches of development into development.