News for hackers. Stuff that matters.
Re:Git concepts simplified by tbatterii on Thursday September 26, 2013 @02:12PM (#6452545)
> 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. :)

Re:Git concepts simplified by MBCook on Thursday September 26, 2013 @09:39PM (#6454743)
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.