Re: Merging in Subversion

2011-01-31 Thread Ulrich Eckhardt
On Monday 31 January 2011, Waseem Bokhari wrote: > After a long struggle; Finally I have transferred all my 100 + VSS Projects > to Subversion in Windows environment. Congrats! We did the same a few years ago and we never looked back. > I have strong Branching and Merging requirements for these.

RE: Merging in Subversion

2011-02-01 Thread Bob Archer
> > . Is there any best way to merge files in SVN or you need to > > incorporate any strong merging tool? > > Text files are handled well by SVN's builtin merging capabilities. > For other > files, I don't know how to merge them. In practice, I consider > anything > non-textual as non-mergable, t