"svn up" and problem with blog-stream
Matthias Dieke <[email protected]>
| Newsgroups | gmane.comp.cms.bitflux.general |
|---|---|
| Message-ID | <[email protected]> |
Hi, some weeks ago I had to modify the blog-stream to give the possibility editing the blog-author. Today I made "svn up" and I get some trouble with "/inc/bx/streams/blog.php". I have four files there: - blog.php - blog.php.mine - blog.php.r5713 - blog.php.r5865 I'm not such a Linux and/or SVN "freak", how can I get a working version without loose my changes? Thanks Matthias -- bitflux-cms mailing list [email protected] http://lists.bitflux.ch/cgi-bin/listinfo/bitflux-cms