Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.
Comment: Migrated to Confluence 5.3

...

In my experience using git it is usually a really good idea to follow some conventions about the order of doing things.  Regarding rebasing, which can be confusing and potentially cause a lot of havoc if done improperly, I like to always confine my rebasing to private local branches of my repository, this means that even if I didn't actually make a branch off of develop to work in, I'll still make a branch before I do any rebasing.  This adds an extra level of security, because now you have convenient labels to your original history that aren't going to go away while you work.

...