> The decision of when to merge vs. rebase is still confusing to me. i always th... | Hacker News

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

login

tbatterii on Sept 26, 2013 | parent | context | favorite | on: Git concepts simplified

> The decision of when to merge vs. rebase is still confusing to me.

i always thought it was "never rebase commits you have pushed" at least you know about rebase though. :)

MBCook on Sept 27, 2013 [–]

That is certainly the rule 99.99999% of the time. It's possible, but it can be a mess for everyone else.

Before you push, you can choose to do it either way.

Consider applying for YC's W25 batch! Applications are open till Nov 12.
Guidelines | FAQ | Lists | API | Security | Legal | Apply to YC | Contact