Page History

...

• patch can be applied to the HEAD of current ignite-sprint-xxx 'master' branch by "git am <patch-file>" without conflicts.
  
• patch has to have all changes in one commit with comment like "ignite-xxx: Implemented."
• patch-file has to have 'patch', 'txt' or 'diff' extension

...

For example, if you are starting working on the feature IGNITE-9999, the work should be done in ignite-sprint-999 branch.

## Get the repo
git clone -b ignite-sprint-999 https://github.com/apache/incubator-ignite.gitgit checkout -b ignite-9999

## 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';

...

## 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 mergecheckout ignite-9999 

git merge mastersprint-999

## 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 current sprint branch (git merge ignite-sprint-999) 'master' branch to your development branch, for example, every day (or after each commit).

...