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

Just don't rebase something that you've shared with others. It's just rude.


Do people not collaborate on feature branches?


Don't rebase ESPECIALLY stuff that people are collaborating on.


Well aware of that, but in my experience I sometimes collaborate on feature branches with 1-2 people and we just communicate when there's a rebase happening (For example if there was a bigger change in main and we want to align our feature branch on it). I don't think that's very uncommon.


Pull requests after comments and revision?


Doing a squish merge on the actual merge, at least on github doing a rebase mid-pr makes the PR act funny (comments point at non-existent revisions and such).

When I was at amazon their internal PR tool handled them just fine so I would do them in that case.

There's more nuance to the OPs comment along the lines of

> Don't rebase on branches others are working on

On a pr branch I usually at most expect others to pull and do a build to run it locally so I'm not very worried about wiping out changes.




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

Search: