Versions Compared

Key

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

Fork the

...

GitHub ASF Mirror Repo

Assume we have a forked repo at https://github.com/contributor/incubator-quickstep.

...

Finally, once the PR is ready to be merged (i.e. it has passed all the tests and the python validation scripts as described above), we need to squash all the commits into one commit. We cherry pick the first commit, and squash all the rest as follows:

  1. git remote add asf-mirror git@github.com:apache/incubator-quickstep.git
  2. git remove -v
  3. git fetch asf-mirror master
  4. git rebase -i asf-mirror/master
  5. In the editor, you should see something like: 
    pick QUICKSTEP-101: Added My Awesome Feature.
    pick Addressed Review Comments.
  6. While still in the editor, modify the second line to the following.
    f Addressed Review Comments.
  7. Check the git log using: git log.
  8. Check the "Author" field in the last commit with the intended name and email. Amend if needed.
  9. Now you are ready to push the code. You can do that using: git push origin quickstep-101 -f

 

Create a Pull Request (PR) for the new feature

Use the GitHub ASF mirror repo: https://github.com/apache/incubator-quickstep, and set the title to, in this case, QUICKSTEP-101: Added My Awesome Feature.