Quote from: OpenGeek at Aug 19, 2005, 11:36 PM
We’ll need to work that out during the merge. When you SVN Add, SVN Remove etc., that will be applied to the trunk as well, and any conflicts will be handled before any commit is made. It’s really not that bad of a process, even when there are major changes in existing files.
Except that authentication, manager/index.php, error handling, messaging, etc., have all been changed. For instance, there is no header.inc.php, footer.inc.php, accesscontrol.inc.php, frames/*, no files with "chunk" or "htmlsnippet", etc., while things like manager/index.php has been completely rewritten, so I’m not exactly sure how its going to merge changes: *Every* backend file has been altered, at least two dozen files removed, and nearly that many more added.