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

He's probably angry because he's had a person with 15 years experience unstage 10 commits already pushed to origin (reset HEAD~10) then readd them to the index and complain to everyone that git tells him every file in his repo is conflicting after a merge. After a serious bout of ROFL he has to help the coworker use merge correctly weekly. After a while of this the person decides to manually fix the conflicts each time he has to push to origin there adding a comment in the git log that says :merged master back into branch.

So to all of you that actually know the difference between merge and rebase and what the difference between origin and local branches are :hattip:




Join us for AI Startup School this June 16-17 in San Francisco!

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

Search: