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

> EDIT: currently I always rebase our feature branches before submitting the PR to try and mitigate this and make sure review happens quickly after that. it doesn't fully solve the problem but it's the best flow I've found.

I rebase after the PR has been discussed and "approved" for merging. I feel having the individual commits during discussion time are useful for context, so long as team members are earnest enough to use them. Usually good commit messages can answer every "Why did you do it this way?" question before it even gets asked.



You can rebase without squashing to get the benefits of both approaches.


Hah! Great point. I always forget that because I do so very rarely.




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

Search: