I actually agree with Cos and think we can switch to "rebase" instead of "merge".
Does anyone foresee any problems with this change? D. On Mon, Jul 27, 2015 at 2:01 PM, Konstantin Boudnik <c...@apache.org> wrote: > I would like to propose the following modification of the process, offered > in > this page (and it would apply for the ppl working on their branches > directly > too). Namely: > > - replace > % git merge master > with > % git rebase master > > which will allow to avoid empty and non-informative non-fast forward > commits and also will help to maintain the clean history. You still need to > resolve the conflicts though, but most likely you won't have stuff like > this sitting around: > > | * commit a57707f6ef387ea6f48fd878747e8c5044e7758e > | |\ Merge: 0b25ec2 c044bb8 > | | | Author: Denis Magda <dma...@gridgain.com> > | | | Date: Wed Jul 22 15:49:04 2015 +0300 > | | | > | | | Merge branch 'master' of > https://git-wip-us.apache.org/repos/asf/incubator-ignite > | | | > | * | commit 0b25ec2216f7d7c54f29cc9c4ca465c55ed8c0a1 > | | | Author: Denis Magda <dma...@gridgain.com> > | | | Date: Wed Jul 22 15:48:36 2015 +0300 > | | | > | | | muted failing discovery test > | | | > * | | commit 2e1dea945b486006214eaa8005a7d3b398c8f549 > |\ \ \ Merge: 5202527 c044bb8 > | | |/ Author: S.Vladykin <svlady...@gridgain.com> > | |/| Date: Wed Jul 22 15:11:38 2015 +0300 > | | | > | | | Merge branches 'ignite-1015' and 'master' of > https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-1015 > | | | > | * | commit c044bb8278d724336d17fbc2dcd34b0957ac41ec > | | | Author: S.Vladykin <svlady...@gridgain.com> > | | | Date: Wed Jul 22 15:10:29 2015 +0300 > | | | > | | | master - disabled test. fix in ignite-959-z > | | | > * | | commit 52025271f3db6e764ab62d0483966159d004b42c > |\ \ \ Merge: 301f573 8e1492a > | |/ / Author: S.Vladykin <svlady...@gridgain.com> > | | | Date: Wed Jul 22 09:04:55 2015 +0300 > | | | > | | | Merge branch 'master' of > https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-1015 > > - squash the intermediate commits in your own branch, as they are adding no > value to anyone, but polluting the history and making potential reverts > nearly impossible. > > With these two changes in the process the patch preparation scripts (which > I > found to be overly complex) would be replaced with a single command > > % git format-patch HEAD~1 --stdout > JIRA-###.patch > > Would be happy to answer any questions, if needed. > Cos > > On Mon, Jul 27, 2015 at 10:38AM, Dmitriy Setrakyan wrote: > > The patch process is also described in "How to Contribute" section: > > https://cwiki.apache.org/confluence/display/IGNITE/How+to+Contribute > > > > I think it makes sense to update this page as well. > > > > D. > > > > On Mon, Jul 27, 2015 at 10:32 AM, Alexey Goncharuk < > > alexey.goncha...@gmail.com> wrote: > > > > > > > > > > > > > > Alexey, can you provide the link to the updated document? I cannot > find > > > it > > > > on Wiki or website. > > > > > > > > > It is the document about the sprint process: > > > https://cwiki.apache.org/confluence/display/IGNITE/Sprint+Process > > > > > > --AG > > > >
