Hacker News new | ask | show | jobs
by SushiHippie 847 days ago
Ah true didn't think of that, as I've never worked on such large projects were force pushing becomes a problem.

But with manually editing .patch files you need to manually find out how to resolve the conflicts, while in a rebase git at least shows you the merge conflicts.