[dba-VB] SCRUM: Source Code Control

I got the form back.
How do I rebuild csproj?
I guess to delete it ... here goes!

-
Michael R Mattys
MapPoint and Database Dev
www.mattysconsulting.com
-
----- Original Message ----- 
From: "Mike Mattys" <mmattys at rochester.rr.com>
To: "Salakhetdinov Shamil" <mcp2004 at mail.ru>; "Discussion concerning Visual 
Basic and related programming issues." <dba-vb at databaseadvisors.com>
Sent: Thursday, April 02, 2009 11:41 PM
Subject: Re: [dba-VB] SCRUM: Source Code Control


>I spent a two hours making that form and I pressed update- now it's gone!
> What did I do wrong?
> Should I have comitted first?
>
> Also, every time I update the Northwind.NET.FE.csproj is corrupt.
> It has <<<<<< or >>>>>>>
> What can I do?