The conflict arises because the object(s) in question in both your local source and your repository have been updated (independently).
SVN can't identify which edit takes precedence, so your local working copy is "conflicted". Source Control allows you to accept either the working copy or the repository copy to resolve the conflict.
You can also resolve the conflict manually (use caution).
Source Control actually maintains two working copies -- one under Transients and one under WorkingBases:
C:\Users\<Username>\AppData\Local\Red Gate\<Source Control For Oracle Version>\Transients C:\Users\<Username>\AppData\Local\Red Gate\<Source Control For Oracle Version>\WorkingBases
Note: The specific project names have cryptic names. They can be resolved by looking at the XML properties files under C:\Users\<Username>\AppData\Local\Red Gate\<Source Control For Oracle Version>\:
The DB IDs can be resolved to the project name in ConnectionStore.xml: Xpath: //DatabaseConnections/value/concat("Project Name: ", ProjectName, " | DB ID: ",ConnectionGuid)
mindcraft
Posts: 1 New member
Comments
SVN can't identify which edit takes precedence, so your local working copy is "conflicted".
Source Control allows you to accept either the working copy or the repository copy to resolve the conflict.
You can also resolve the conflict manually (use caution).
Source Control actually maintains two working copies -- one under Transients and one under WorkingBases:
C:\Users\<Username>\AppData\Local\Red Gate\<Source Control For Oracle Version>\Transients
C:\Users\<Username>\AppData\Local\Red Gate\<Source Control For Oracle Version>\WorkingBases
Note: The specific project names have cryptic names. They can be resolved by looking at the XML properties files under C:\Users\<Username>\AppData\Local\Red Gate\<Source Control For Oracle Version>\:
LinkedDatabases.xml
XPath for a quick dump:
//LinkedDatabaseList/value/concat("DB ID: ", DatabaseId/ServerAndInstanceName, ' | RepoType: ', ISrcCLocation/@type, " | Repo URL: ", ISrcCLocation/RepositoryUrl, ' | WorkSpace: ', IWorkspaceId/RootPath, ' | Transient: ', ScriptTransientId/RootPath)
The DB IDs can be resolved to the project name in ConnectionStore.xml:
Xpath:
//DatabaseConnections/value/concat("Project Name: ", ProjectName, " | DB ID: ",ConnectionGuid)