RE: Help with constant conflicts

2011-05-13 Thread Bob Archer
> On Fri, May 13, 2011 at 4:35 PM, Stephen Butler > wrote: > > > > On May 13, 2011, at 13:41 , K.L. wrote: > > > >> Hi, > >> > >> Having problems with merge. > > > > [...] > > > >> me@localhost /srv/www/svnbugs/branches/branch1 $ svn merge > >> svn+ssh://example.com/var/svn/svnbugs/trunk > >> ---

Re: Help with constant conflicts

2011-05-13 Thread K.L.
On Fri, May 13, 2011 at 4:35 PM, Stephen Butler wrote: > > On May 13, 2011, at 13:41 , K.L. wrote: > >> Hi, >> >> Having problems with merge. > > [...] > >> me@localhost /srv/www/svnbugs/branches/branch1 $ svn merge >> svn+ssh://example.com/var/svn/svnbugs/trunk >> --- Merging r4 through r5 into '

Re: Help with constant conflicts

2011-05-13 Thread Stephen Butler
On May 13, 2011, at 13:41 , K.L. wrote: > Hi, > > Having problems with merge. [...] > me@localhost /srv/www/svnbugs/branches/branch1 $ svn merge > svn+ssh://example.com/var/svn/svnbugs/trunk > --- Merging r4 through r5 into '.': > Adir2 [...] > me@localhost /srv/www/svnbugs/trunk $ svn m