Versions Compared

Key

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

Fork the ASF repo

$ git clone https://git-wip-us.apache.org/repos/asf/incubator-quickstep.git quickstep

$ cd quickstep

Work on a new feature

$ git checkout master

$ git checkout -b my-awesome-feature

$ git add some-changed-or-new-files

$ git commit -m "Added My Awesome Feature."// We could also

$ git push origin my-awesome-feature

 

// Sometime we have code review comments after opening a PR.

$ git add more-changed-or-new-files

$ git commit -m "Addressed Review Comments."

 

// Finally, once we as a PR submitter are ready for merging a feature,

// we have to squash all the commits into one here. We cherry pick up

// the first commit, and squash all the rest.

$ git rebase -i origin/master

// In the editor, we would see

//   pick Added My Awesome Feature.

//   pick Addressed Review Comments.

// And we need to modify all the content (except to the first line) to "s Addressed Review Comments.".

 

$ git push origin my-awesome-feature [feature -f]

Create a PR for the new feature

Use the GitHub ASF mirror repo: https://github.com/apache/incubator-quickstep

Merge a PR

// Update the local fork with the new branch my-awesome-feature.
$ git fetch origin
$ git checkout master

// We may need to squash multiple commits into oneshould ensure this is one commit w/ a well-written commit message.
$ git rebase -i origin/my-awesome-feature

...