Page History

...

• You need to fork an Apache Ignite mirror on GitHub.
• Make a local copy of your Apache Ignite mirror fork. Your remote origin will refer to 'https://github.com/<your_github_uname>/incubator-ignite.git'.

• You will need to update a local master sometimes (to merge to your development branches sometimes). How to do it:

  • Add remote for Apache Ignite mirror (you need to do it once)

    git remote add upstream https://github.com/apache/ignite.git

  • Each time when you want to update your local master do nextthe following:

    Code Block
    git pull upstream git checkout master

    git pull upstream

To make contribution:

• Fix / implement JIRA ticket in your fork. Commit branch to origin (origin = your fork). It's recommended to develop IGNITE-xxx ticket at ignite-xxx branch.
• Create pull request from the new remote branch in the fork to master of Apache Ignite mirror. Please, start a title of the pull request from 'IGNITE-xxx'. An email about the pull request will be send to dev-list and the same JIRA comment will be added to the IGNITE-xxx ticket.
• TeamCity will automatically trigger builds and label it as a "pull/<pull-request-number>/head". Select this label in the branches dropdown and monitor test results.
• Once tests are passed, the pull request can be reviewed and merged by a committer.

...

For example, if you are starting working on the feature IGNITE-9999.

## Get the repo

...

git clone https://github.com/apache/incubator-ignite.git

...

## Some development here with many commits at ignite-9999.

...

git commit -a -m 'ignite-9999: Intermediate commit 1';

...

...

...

git commit -a -m 'ignite-9999: Intermediate commit 100';

...

## Commit the last changes.

...

git commit -a -m 'ignite-9999: Implemented.';

...

## Making patch.

...

## There are a lot of changes at ignite-sprint-999 and we need to get it, resolve conflicts (if exists), rerun tests for ignite-9999.

...

 
git checkout master 

...

git pull  

...

git checkout ignite-

...

9999 
git merge master

...

## Run script to make patch. Patch will have all changes as one commit.

...

<ignite_home>/scripts/git-format-patch.sh

Note: it is strongly recommended to merge 'master' branch to your development branch, for example, every day (or after each commit).

...