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 <dan.bol...@gmail.com> 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/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 11 March 2013 06:58, Yury Katkov <katkov.ju...@gmail.com> wrote:
> > 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 <dan.bol...@gmail.com> wrote:
> >>
> >> On 8 March 2013 10:24, Yury Katkov <katkov.ju...@gmail.com> 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 and send the patches to developers. I've tried to use
> >> > PhpStorm
> >> > merge tool but it overwrites the changes instead of merging them.
> >> >
> >> > Another issue is that we don't have .git directory in our patched
> >> > Forms2.5.1
> >>
> >> This is a little tricky, but can be overcome... first git clone SF,
> >> then checkout the version that you've patched. Then create a new
> >> branch and carefully apply (and commit) your changes to that branch.
> >> Now you could try to rebase or simply generate a .patch to send to
> >> devs. Git gives you more than enough rope to hang yourself, so don't
> >> worry if you get tied in knots to begin with! (Just make sure your
> >> changes are backed up!)
> >>
> >>
> >> HTH,
> >> Dan.
> >>
> >> > -----
> >> > Yury Katkov, WikiVote
> >> >
> >> >
> >> >
> >> >
> ------------------------------------------------------------------------------
> >> > Symantec Endpoint Protection 12 positioned as A LEADER in The
> Forrester
> >> > Wave(TM): Endpoint Security, Q1 2013 and "remains a good choice" in
> the
> >> > endpoint security space. For insight on selecting the right partner to
> >> > tackle endpoint security challenges, access the full report.
> >> > http://p.sf.net/sfu/symantec-dev2dev
> >> > _______________________________________________
> >> > Semediawiki-devel mailing list
> >> > Semediawiki-devel@lists.sourceforge.net
> >> > https://lists.sourceforge.net/lists/listinfo/semediawiki-devel
> >> >
> >
> >
>
------------------------------------------------------------------------------
Symantec Endpoint Protection 12 positioned as A LEADER in The Forrester
Wave(TM): Endpoint Security, Q1 2013 and "remains a good choice" in the
endpoint security space. For insight on selecting the right partner to
tackle endpoint security challenges, access the full report.
http://p.sf.net/sfu/symantec-dev2dev
_______________________________________________
Semediawiki-devel mailing list
Semediawiki-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/semediawiki-devel
