git rebase master vs git merge master

  • dirtyhand: so, if im working on a branch and stuff in the master gets committed, when should I rebase vs doing a master merge into the branch?
  • mojombo: rebase is good for keeping local branches clean, but once they're pushed up, rebase is unwise
  • dirtyhand: what about Lighthouse reporting all github commits as being made by the account owner.
  • mojombo: we'll probably add the user level stuff to the LH integration before too long

We love Tumblr. Theme (Innovate) by Thijs