Download VisualSvn Server, open a command prompt and type svn resolved -R . to resolve all conflicts, then commit again.
Resolve Conflicted Files That Don't Exist
Related
-
The UK government had setup the Independent Commision on Freedom of Information with an eye to review the Freedom Of Information Act:
-
Removing index.php from SilverStripe sites
If your website has mod_rewrite enabled but the URL's generated by SilverStripe still contain 'index.php' then SilverStripe is unable to de…
-
In your datamodel you might have a Enum field such as this date-based dropdown:
-
LessThanOrEqual in SilverStripe 3.0
When adding a filter on a DataList sometimes you need to do a
-
How to provide and manage your own permissions
At some point on your journey through the jungle that is SilverStripe, you will want to create permissions and assign users to them. You mi…