Fork the ASF repo

$ 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."

$ 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 -f

// Update the local fork with the new branch my-awesome-feature.

$ git fetch origin

$ git checkout master

// We should ensure this is one commit w/ a well-written commit message.
$ git rebase -i origin/my-awesome-feature

// It triggers asfgit to merge the PR in GitHub ASF mirror repo.

$ git push origin master

// It triggers asfgit to delete the merged branch.

$ git push origin --delete my-awesome-feature