Re: [SMW-devel] good ways for merging

2013-03-12 Thread Yury Katkov
Thank you very much for the links, that's really interesting intro! - Yury Katkov, WikiVote On Mon, Mar 11, 2013 at 1:41 PM, Dan Bolser wrote: > I never used sub-modules tbh. > > BTW, the best git overview / working pattern I've read is here: > https://github.com/parrot/parrot/blob/maste

Re: [SMW-devel] good ways for merging

2013-03-11 Thread Dan Bolser
I never used sub-modules tbh. BTW, the best git overview / working pattern I've read is here: https://github.com/parrot/parrot/blob/master/docs/project/git_workflow.pod With this attendant glossary: https://github.com/parrot/parrot/blob/master/docs/project/git_terminology.pod Cheers, Dan. On 1

Re: [SMW-devel] good ways for merging

2013-03-10 Thread Yury Katkov
Thanks Dan! That helps! I wonder are there any good practices to store the open source code that we depend on and sometimes modify a bit... Maybe git submodules can help here? - Yury Katkov, WikiVote On Sat, Mar 9, 2013 at 3:48 PM, Dan Bolser wrote: > On 8 March 2013 10:24, Yury Katkov w

Re: [SMW-devel] good ways for merging

2013-03-09 Thread Dan Bolser
On 8 March 2013 10:24, Yury Katkov wrote: > Hi guys! > > I'm quite ashamed to ask such a newbie questions but anyway: how do you > usually merge your changes? So we're now depend on Forms 2.5.1 and have made > some modifiactions there. We want to depend on Forms 2.5.2, patch it with > our changes