O'Reilly logo
  • Samanthi Jinadasa thinks this is interesting:

You can use the --rebase option to tell Git to rebase your local changes on top of the remote changes instead of performing a merge.

From

Cover of Pragmatic Guide to Git

Note

What I should do.