FIX: pull with rebase instead of merge

Aplying many changes may cause broken code. This way
each commit is applied to the branch instead of merging
the last one