|
BigBrain Member Level: 22 Posts: 51/85 EXP: 55327 For next: 3023 Since: 09-10-08 Since last post: 8.9 years Last activity: 6.8 years |
|
Originally posted by dirbaio Yeah sorry, I confused update with merge: svn update tries to combine changes (and reports any conflicts if it can't) svn merge overwrites the old file (seems to me like it does so at least) That is: you'll only need svn update as long as you don't do anything with branches. ____________________ GSoC 2009 - working for the Wine Project this year |





