I always squash my commits before rebasing. Is your way easier? I never really seem to have a problem with merge conflicts.