[pLog-svn] How do I merge my code with plog latest code easily.

[Jon Daley]

 	Do you use subversion to get the latest code?  If so, the job 
shouldn't be quite as bad, as subversion can do some (most?) of the 
merging itself.
 	Also, if you stay more up-to-date with things, it is likely the 
merges will be more automatic, rather than big upgrades every once in a 
while.
 	I don't think there is an overlay option in PHP like there is with 
perl - that would be the best solution.
 	I keep my stuff under revision control with cvs, and then get 
plog's changes with svn.  It would be nice if I could use svn for both, 
but I am not sure that is possible.

On Sat, 9 Jul 2005, nick nizhenyuan wrote:
> I wrote a lot of code for my site.
>
> And when Plog team release new version, I have to pick up every word
> by myself and integreted them into the new plog code.
>
> Could some tell me some techniques to avoid the heavy work?
>
> Thanks in advance:)
> _______________________________________________
> pLog-svn mailing list
> pLog-svn at devel.plogworld.net
> http://devel.plogworld.net/mailman/listinfo/plog-svn
>

**************************************************************
*         Jon Daley         *  Choose two: Good, Fast, Cheap *
* http://jon.limedaley.com/ *                                *
**************************************************************