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

And you can deal with them in any order, bit by bit, or by adjusting things in earlier commits. I no longer fear rebase conflicts.


I mean that's what I do in Git as well, I just don't do it by storing conflicts, but by not triggering them/ignoring them.




Consider applying for YC's Winter 2027 batch! Applications are open till November 2.

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

Search: