Hacker News new | ask | show | jobs
by nazgul17 1228 days ago
You could do a rebase instead of a merge