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

the real "mistake" here was not doing 'pull' it was doing 'pull' while having uncommitted changes in the working directory. I'd commit or stash before the pull/


I would have sworn that git would refuse to do git pull with uncommitted local changes.


It won't let you pull if checked-in files have been modified, but it will let you pull if you have uncommitted new files.




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

Search: