Omg Git gets me crazy with merge and rebase features