vb.org Archive

vb.org Archive (https://vborg.vbsupport.ru/index.php)
-   vB4 General Discussions (https://vborg.vbsupport.ru/forumdisplay.php?f=251)
-   -   4.2.1 Alpha 1 Template Update failure (https://vborg.vbsupport.ru/showthread.php?t=299255)

Snowhog 06-19-2013 12:24 AM

4.2.1 Alpha 1 Template Update failure
 
We updated to version 4.2.1 (from 4.2.0 PL3) and a single Mobile template is reported as an update failure: headinclude (The attempted merge failed due to conflicts).

headinclude
Default Template Updated in vBulletin 4.2.1 Alpha 1 by vBulletin Solutions
Your Custom Template Last Edited in vBulletin 4.1.9 Beta 1 by xiaoyu
The attempted merge failed due to conflicts

I don't know how to interpret this. Should I 'revert' or make changes, and if so, what changes?

Thank you.

Lynne 06-19-2013 01:21 AM

So click to view the template, then click the View History link and compare your template to the new one. Then go make any necessary changes.

Snowhog 06-19-2013 01:52 AM

1 Attachment(s)
There is no 'View History' link, although I can click on 'View Side by Side', which I've done. That shows me what is in the Customized Template, what "would" be in the merged template, and what the new default template would be. The conflict section is attached as a .png file. If I knew what to do, I wouldn't be asking (no offense given; it's HOT here). :)

ForceHSS 06-19-2013 03:42 AM

Do a revert on it

Snowhog 06-19-2013 05:47 AM

Done. Thank you.


All times are GMT. The time now is 06:18 AM.

Powered by vBulletin® Version 3.8.12 by vBS
Copyright ©2000 - 2025, vBulletin Solutions Inc.

X vBulletin 3.8.12 by vBS Debug Information
  • Page Generation 0.02977 seconds
  • Memory Usage 1,705KB
  • Queries Executed 10 (?)
More Information
Template Usage:
  • (1)ad_footer_end
  • (1)ad_footer_start
  • (1)ad_header_end
  • (1)ad_header_logo
  • (1)ad_navbar_below
  • (1)footer
  • (1)gobutton
  • (1)header
  • (1)headinclude
  • (6)option
  • (1)post_thanks_navbar_search
  • (1)printthread
  • (5)printthreadbit
  • (1)spacer_close
  • (1)spacer_open 

Phrase Groups Available:
  • global
  • postbit
  • showthread
Included Files:
  • ./printthread.php
  • ./global.php
  • ./includes/init.php
  • ./includes/class_core.php
  • ./includes/config.php
  • ./includes/functions.php
  • ./includes/class_hook.php
  • ./includes/modsystem_functions.php
  • ./includes/class_bbcode_alt.php
  • ./includes/class_bbcode.php
  • ./includes/functions_bigthree.php 

Hooks Called:
  • init_startup
  • init_startup_session_setup_start
  • init_startup_session_setup_complete
  • cache_permissions
  • fetch_threadinfo_query
  • fetch_threadinfo
  • fetch_foruminfo
  • style_fetch
  • cache_templates
  • global_start
  • parse_templates
  • global_setup_complete
  • printthread_start
  • bbcode_fetch_tags
  • bbcode_create
  • bbcode_parse_start
  • bbcode_parse_complete_precache
  • bbcode_parse_complete
  • printthread_post
  • printthread_complete