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

Surprised to not see git-rebase cited in #3.

> git-rebase - Forward-port local commits to the updated upstream head

I avoided rebasing for the longest time because of that. If it had just said "puts your stuff in front of their stuff" it would've been a lot less intimidating.

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