git squash for everyday use; no more merge conflicts, no more headaches.