Hacker Newsnew | past | comments | ask | show | jobs | submitlogin

Yes, exactly. And if your team consists of perhaps slightly less tech-oriented people (on our team it's the designers), trying to explain what rebase does and how to use it with its exceptions (the "Few notes though..." part of the article) is a recipe for confusion and broken repos. Which is why our policy is "rebase if you know what you're doing, otherwise merge".


Guidelines | FAQ | Lists | API | Security | Legal | Apply to YC | Contact

Search: