You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Sumant Gupta <sk...@cfest.com> on 2009/03/27 01:40:44 UTC
How to resolve conflict in Ankh while working in Visual Studio 2008
While committing we got following conflict. Can we resolve within Ankh
Index: CFPlotting/CFPlotting.csproj
===================================================================
--- CFPlotting/CFPlotting.csproj (revision 5)
+++ CFPlotting/CFPlotting.csproj (working copy)
@@ -2,7 +2,11 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == ''
">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+<<<<<<< .mine
+ <ProductVersion>9.0.30729</ProductVersion>
+=======
<ProductVersion>9.0.21022</ProductVersion>
+>>>>>>> .r5
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{A510246A-E4E5-4D69-894B-AB6A93E3A221}</ProjectGuid>
<OutputType>Library</OutputType>
Thanks . Sorry to bother you. We have 3 decades of code development
experience however we started using SVN now.
Sumant
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1438280
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: How to resolve conflict in Ankh while working in Visual Studio
2008
Posted by Andy Levy <an...@gmail.com>.
On Thu, Mar 26, 2009 at 21:40, Sumant Gupta <sk...@cfest.com> wrote:
> While committing we got following conflict. Can we resolve within Ankh
You'd have to ask in an AnkhSVN support venue.
Please stop CCing me & other individuals personally on your new threads.
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1438342
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].