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
-----
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
