[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?

-
Michael R Mattys
MapPoint and Database Dev
www.mattysconsulting.com
-