Hi Gianfranco, You need to merge ignite-sptint-5 branch to your ignite-788 (not vice versa).
Right steps: ## Get the repo git clone -b ignite-sprint-5 https://github.com/apache/incubator-ignite.git git checkout -b ignite-788 ## Some development here with many commits at ignite-788. git commit -a -m 'ignite-788: Intermediate commit 1'; ... git commit -a -m 'ignite-788: Intermediate commit 100'; ## Commit the last changes. git commit -a -m 'ignite-788: Implemented.'; ## Making patch. ## There are a lot of changes at ignite-sprint-5 and we need to get it, resolve conflicts (if exists), rerun tests for ignite-788. git merge ignite-sprint-5 ## Run script to make patch. Patch will have all changes as one commit. ./scripts/git-format-patch.sh Note: it is strongly recommended to merge current sprint branch (git merge ignite-sprint-5) to your development branch, for example, every day (or after each commit). Let me know, if step-by-step description helps you, then I will add it to our wiki. -- Artem -- On Wed, Jun 3, 2015 at 11:06 AM, Gianfranco Murador < [email protected]> wrote: > Hi Artem, > I'm going to run the following commands to create the patch. are these > steps correct ? > > ## Get the repo > git clone -b ignite-sprint-5 > https://github.com/apache/incubator-ignite.git > git checkout -b ignite-788 > > ## Commit the changes > git commit -a -m 'Ignite 788 Implementation'; > git checkout -b ignite-sprint-5 > git merge ignite-788 > > ## launch the script to create a file patch > scripts/git-format-patch.sh > > Thank you, > Regards, Gianfranco > > > > 2015-06-02 17:44 GMT+02:00 Artiom Shutak <[email protected]>: > > > Hi Atri, > > > > Now, we have useful information about patching here: > > https://cwiki.apache.org/confluence/display/IGNITE/Sprint+Process. > > But I agree with Cos, we need to have a page like "How to contribute". I > > will do it. > > > > Atri, thanks, for your feed back. You should be on branch with your > > changes. I will add more understandable information at the script. > > > > > > -- Artem -- > > > > On Tue, Jun 2, 2015 at 6:28 PM, Konstantin Boudnik <[email protected]> > wrote: > > > > > In Bigtop we follow this process > > > > https://cwiki.apache.org/confluence/display/BIGTOP/How+to+Contribute > > > > > > which is quite handy as it turned out. > > > > > > Cos > > > > > > On Tue, Jun 02, 2015 at 08:38PM, Atri Sharma wrote: > > > > Folks, > > > > > > > > Is git diff > patch.patch good enough to be put on JIRA? I tried > > running > > > > format script but got following errors (I am on sprint 5 branch): > > > > > > > > > > > > Already on 'ignite-sprint-5' > > > > Your branch is ahead of 'origin/ignite-sprint-5' by 1 commit. > > > > Switched to a new branch 'tmppatch' > > > > (nothing to squash)Already up-to-date. > > > > # On branch tmppatch > > > > > > > > > > > > and it generates an empty patch file. > > > > > > > > > > > > -- > > > > Regards, > > > > > > > > Atri > > > > *l'apprenant* > > > > > >
