On: Git concepts simplified

[tbatterii]

> 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 → tbatterii]

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.