michelsalib
commented
12 years ago This is because you don't clean your tree before merging. You might want to use fetch+rebase instead of pull, so that you don't push the "merge commit".
Closed AlbertoMonteiro closed 12 years ago
michelsalib
commented
12 years ago This is because you don't clean your tree before merging. You might want to use fetch+rebase instead of pull, so that you don't push the "merge commit".
Sux cant merge this pull request -.-.... Well tomorrow I will refork and fix it