Versions Compared

Old Version 28

changes.mady.by.user Dmitriy Setrakyan

Saved on

compared with

New Version 29

changes.mady.by.user Dmitriy Setrakyan

Saved on

Key

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

...

  1. GitHub pull-request
  2. Patch-file
  3. Ticket Branch (only committers)

1.

...

Create GitHub pull-request

 

 +------------+             +---------------+            +-----------------+

...

  1. Checks that you don't have any uncommitted changes.
  2. Checks you are one master branch and master branch is up-to-date.
  3. Updates local master from Apache git repo.
  4. Fetches pull request to a local branch:

    • git fetch upstream pull/<id>/head:pull-<id>-head

  5. Saves an author and a comment of the last commit at pull-<id>-head.
  6. Merges from the new branch to master:
    • git merge --squash pull-<id>-head
  7. Ask you about custom comment or using the saved comment.
  8. Commit to local master. The script automatically sign-off a commit and add "Fixes #<id>." suffix to comment (It will close the pull request, see https://help.github.com/articles/closing-issues-via-commit-messages/):
    • git commit --author=“<saved_author>" -s -m “<comment> - Fixes #<id>.”

Now, you will have one commit at master with all changes from pull-request. Changes can be reviewed again. If you accept all changes and want to push it, do next:

  •  git push apache master

2. Create a Patch-file

2.1 Where to start

You can start by cloning the Ignite GIT repo.

...

So, in case, if a patch can't be applied without conflicts on the HEAD of master and the patch has been created by scripts/git-format-patch.sh then a commiter can apply the patch to master by a revision hash, review changes and resolve the conflicts by yourself.

3.

...

Create a Ticket Branch (only committers)

Whenever working on bigger features, committers can also create 'ready to be reviewed' branch ignite-XXXX, where XXXX is the number of the JIRA ticket.

...