News for hackers. Stuff that matters.

picod

Re:Ask HN: Git merge vs. rebase, when and how? on Friday November 29, 2019 @01:08PM (#21665861)
merge

- when commits of both branch need to preserve

- when additional zero file “merged commit” is ok

- when chronology order of commits need to maintain

rebase

- when commit of both need to preserve

- when zero file “merged commit” is not desired

- when rebased branch commits need to stay on top of other branch

- when change of commit id is ok

Re:Things I’ve learned in 20 years of programming on Friday November 22, 2019 @09:48PM (#21612104)
cool, if this is reliable enough to be part of CI process it will be super useful