Re: GCC Subversion tree conflicts

2016-12-09 Thread Jonathan Wakely
On 8 December 2016 at 22:05, Ethin Probst wrote: > As I do not know how to fix these other than to resolve them, I have > done so, You haven't resolved anything, all you've done is *tell* svn that you resolved them, without actually doing so. The files still have conflicts in, and all you've done

GCC Subversion tree conflicts

2016-12-08 Thread Ethin Probst
While checking out the latest GCC SVN branch (rev. 243,465 as of December 08, 2016), the following conflicts were detected by subversion: [subversion output] Summary of conflicts: Tree conflicts: 34 Tree conflict on 'gcc/INSTALL' > local dir unversioned, incoming dir add upon update Select: (r