Hacker News new | past | comments | ask | show | jobs | submit login

That sounds like Stan was rebasing someone else's work though?

And wait was Stan rebasing main?

I mean yeah, in that case it's definitely, definitely wrong to use rebase. In general though I always rebase my feature branch and only then merge it into main. Because it's rebased onto the head of main and thus a linear series of commits, there's no merge conflicts to fix.




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

Search: