Hacker News new | ask | show | jobs
by Bahamut 3771 days ago
Better to squash before the rebase so you resolve conflicts once rather than x times...and hope there are no nasty merge commits to ruin the history.