Bug 13886 - csproj file breaks when merge conflicts need attention
Summary: csproj file breaks when merge conflicts need attention
Status: RESOLVED FIXED
Alias: None
Product: Xamarin Studio
Classification: Desktop
Component: Version Control ()
Version: 4.0.12
Hardware: Macintosh Mac OS
: --- normal
Target Milestone: master
Assignee: Marius Ungureanu
URL:
Depends on:
Blocks:
 
Reported: 2013-08-09 09:47 UTC by Neal
Modified: 2013-08-21 06:31 UTC (History)
2 users (show)

Tags:
Is this bug a regression?: ---
Last known good build:


Attachments
error (14.69 KB, image/png)
2013-08-09 09:47 UTC, Neal
Details


Notice (2018-05-24): bugzilla.xamarin.com is now in read-only mode.

Please join us on Visual Studio Developer Community and in the Xamarin and Mono organizations on GitHub to continue tracking issues. Bugzilla will remain available for reference in read-only mode. We will continue to work on open Bugzilla bugs, copy them to the new locations as needed for follow-up, and add the new items under Related Links.

Our sincere thanks to everyone who has contributed on this bug tracker over the years. Thanks also for your understanding as we make these adjustments and improvements for the future.


Please create a new report on Developer Community or GitHub with your current version information, steps to reproduce, and relevant error messages or log files if you are hitting an issue that looks similar to this resolved bug and you do not yet see a matching new report.

Related Links:
Status:
RESOLVED FIXED

Description Neal 2013-08-09 09:47:04 UTC
Created attachment 4599 [details]
error

Hello,

If I do an "update" from SVN and there are merge conflicts, I get a "load failed" message in the solution explorer as the file needs to be resolved.  We need a way that if a merge conflict arises that I'm presented with a DIFF view or some way of actually resolving this.  Presently, I have to show all files, find the .csproj file, and resolve it, then do a reload.  Your novice users are not going to know how to do this.  There has to be a better way, in all my years of using VS I've never had a problem with the project files and needing manual attention.
Comment 1 Mikayla Hutchinson [MSFT] 2013-08-09 12:52:19 UTC
FWIW there is a Tools -> Edit File on project's now. But yes, it should be a better workflow.
Comment 2 Marius Ungureanu 2013-08-16 09:05:55 UTC
Hmmm, we could add a hook to see if a project is broken and add a Status command to check if it's in a conflicted state. If it is, then we let the user modify the file. Will work on this!
Comment 3 Marius Ungureanu 2013-08-19 12:20:46 UTC
This requires extra attention. We don't support MergeView for .csproj files.
Comment 4 Lluis Sanchez 2013-08-20 06:30:38 UTC
What do you mean we don't support the merge view for .csproj files? A csproj can be opened as a text file.
Comment 5 Marius Ungureanu 2013-08-21 06:31:00 UTC
Added a context menu option to solve conflicted projects/files.

This might need a better notice such as a conflicted overlay for broken projects and a different text message.