Ah, I've only used the Windows GUI briefly. The command-line "svn update" command will always merge your changes back in, though.
According to the TortoiseSVN manual it works the same way - it says that following the update command that "changes done by others will be merged into your files, keeping any changes you may have done to the same files." So, I think that should work out of the box. http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-dug-update.html Stuart JJZolx wrote: > hickinbottoms;313362 Wrote: > >> If you checkout from Subversion and then do an occasional "svn update" >> (or whatever through a GUI like TortoiseSVN) then it won't matter if >> the >> file does change in svn as your changes will be merged back into the >> new >> version. At worse, that merge won't happen and you'll get a conflict, >> but you won't just have your work overwritten. >> > > I do use SVN, in particular TortoiseSVN on Winodows. It won't > overwrite any locally changed files, and informs you of any conflicts. > I've never seen a way to automatically merge local changes, though. > > > _______________________________________________ plugins mailing list [email protected] http://lists.slimdevices.com/lists/listinfo/plugins
