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

merge, then resolve conflicts with rerere, undo the merge and rebase


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

Search: