Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

// We should ensure this is one commit w/ a well-written commit message.
$ git rebase -i origin/my-awesome-feature
// If we see "nop", we are good to go merging. Otherwise,
// encounter any conflicts, the committer should notify the PR submitter
// to resolve them into rebase the branch to become a single mergable commit ahead the current master branch.

$ git log
// If we see a commit message like

...