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

[nick nizhenyuan]

Currenly, just as you said,  I hosted SVN locally. I am still trying
to find ways to link remote SVN and local SVN together, so I could
merge remote latest code to my local SNV code:)

On 7/12/05, Jon Daley <plogworld at jon.limedaley.com> wrote:
>        I was reading the svn manual tonight, and I thought of another
> potential way to keep track of local changes - I don't know how well it
> would work, but thought I would write it for others to think about as
> well.  What if you stored your local modifications as a subversion branch,
> hosted locally?  I'll bet subversion could do a good job of merging
> things if you did that.
> 
>  On Mon, 11 Jul 2005, Jon Daley wrote:
> > Done:
> > http://wiki.plogworld.net/index.php/Merging_with_Subversion
> >
> > On Mon, 11 Jul 2005, Oscar Renalias wrote:
> >> somebody put this in the wiki... this probably is the question of the
> >> month!! (I've already seen it a few times in the forums)
> >
> > **************************************************************
> > *                           *  [He was] a solemn, unsmiling, *
> > *         Jon Daley         *  sanctimonious old iceberg who *
> > *                           *   looked like he was waiting   *
> > * http://jon.limedaley.com/ *  for a vacancy in the Trinity. *
> > *                           *                  -- Mark Twain *
> > **************************************************************
> >
> 
> **************************************************************
> *         Jon Daley         *  I never think of the future.  *
> *                           *      It comes soon enough.     *
> * http://jon.limedaley.com/ *             -- Albert Einstein *
> **************************************************************
> _______________________________________________
> pLog-svn mailing list
> pLog-svn at devel.plogworld.net
> http://devel.plogworld.net/mailman/listinfo/plog-svn
>