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

git status will tell you which files are conflicted.


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

Search: