Mix changes from to branch to master

Merge branch with master

Using a new branch to merge changes
=========
Step 1: 
# Create and swicth to hthe new branch
➜  skynet git:(master) git checkout -b ricardo_simple_form

Step 2: 
# Copy master's changes into the new branch ('Ricardo Simple Form')
➜  skynet git:(ricardo_simple_form) git rebase master

# If there occurs some conflict, go to the file 
➜  skynet git:(d87c554) ✗ git rebase --continue
 
Step 3: 
# Una vez el branch esta mezclado y los conflictos fueron solucionados,
# copiar todo los cambios de este branch en master, para que quede actualizado.
 
➜  skynet git:(ricardo_simple_form) gco master
➜  skynet git:(master) git rebase ricardo_simple_form


====
# Be sure you are on master
➜  skynet git:(tool_assignment) gco master

# Get all the possible changes from origin in master
➜  skynet git:(master) git pull origin master

# Copy the branch 'tool_assignment' in master
$ git rebase master tool_assignment