Bug 20357 - Git merge conflict headers in markup .aspx/.ascx not causing build failure
Summary: Git merge conflict headers in markup .aspx/.ascx not causing build failure
Status: NEW
Alias: None
Product: Class Libraries
Classification: Mono
Component: System.Web (show other bugs)
Version: 3.4.0
Hardware: Macintosh Mac OS
: --- normal
Target Milestone: Untriaged
Assignee: Bugzilla
URL:
Depends on:
Blocks:
 
Reported: 2014-06-04 18:39 UTC by alex
Modified: 2014-06-04 19:10 UTC (History)
1 user (show)

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

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 for Bug 20357 on GitHub or Developer Community if you have new information to add and do not yet see a matching new report.

If the latest results still closely match this report, you can use the original description:

  • Export the original title and description: GitHub Markdown or Developer Community HTML
  • Copy the title and description into the new report. Adjust them to be up-to-date if needed.
  • Add your new information.

In special cases on GitHub you might also want the comments: GitHub Markdown with public comments

Related Links:
Status:
NEW

Description alex 2014-06-04 18:39:36 UTC
As the title implies, the standard Git merge conflitct headers '<<<<<<< HEAD ... ======= ... >>>>>>>' doesn't cause the mono build compiler to fail when processing a .aspx or .ascx page, nor does it report duplicate controls.
The compiler currently appears to skip such invalid files, and issues a warning instead of reporting an error when building (checking warning logs for such errors is currently not an option, due to our legacy code base reporting 100's of warnings, and fixing the sources of these warnings requires serious downtime on our companies behalf, which is not currently an option).
Bug has also been confirmed by a colleague in the office on Windows 7.