The Arcive of Official vBulletin Modifications Site.

Snowhog · #1 06-19-2013, 12:24 AM

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 · #2 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 · #3 06-19-2013, 01:52 AM

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 · #4 06-19-2013, 03:42 AM

Do a revert on it

Snowhog · #5 06-19-2013, 05:47 AM

Done. Thank you.

X vBulletin 3.8.12 by vBS Debug Information
Page Generation 0.03782 seconds Memory Usage 2,208KB Queries Executed 12 (?)
More Information
Template Usage: (1)SHOWTHREAD (1)ad_footer_end (1)ad_footer_start (1)ad_header_end (1)ad_header_logo (1)ad_navbar_below (1)ad_showthread_beforeqr (1)ad_showthread_firstpost (1)ad_showthread_firstpost_sig (1)ad_showthread_firstpost_start (1)footer (1)forumjump (1)forumrules (1)gobutton (1)header (1)headinclude (1)navbar (3)navbar_link (120)option (5)post_thanks_box (5)post_thanks_button (1)post_thanks_javascript (1)post_thanks_navbar_search (5)post_thanks_postbit_info (5)postbit (1)postbit_attachment (5)postbit_onlinestatus (5)postbit_wrapper (1)spacer_close (1)spacer_open (1)tagbit_wrapper Phrase Groups Available: global inlinemod postbit posting reputationlevel showthread	Included Files: ./showthread.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/functions_bigthree.php ./includes/class_postbit.php ./includes/class_bbcode.php ./includes/functions_reputation.php ./includes/functions_post_thanks.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 showthread_start showthread_getinfo forumjump showthread_post_start showthread_query_postids showthread_query bbcode_fetch_tags bbcode_create showthread_postbit_create postbit_factory postbit_display_start post_thanks_function_post_thanks_off_start post_thanks_function_post_thanks_off_end post_thanks_function_fetch_thanks_start post_thanks_function_fetch_thanks_end post_thanks_function_thanked_already_start post_thanks_function_thanked_already_end fetch_musername postbit_imicons bbcode_parse_start bbcode_parse_complete_precache bbcode_parse_complete postbit_display_complete post_thanks_function_can_thank_this_post_start postbit_attachment tag_fetchbit_complete forumrules navbits navbits_complete showthread_complete
Messages:

The Arcive of Official vBulletin Modifications Site.

It is not a VB3 engine, just a parsed copy!