1. This site uses cookies. By continuing to use this site, you are agreeing to our use of cookies. Learn More.

XF 1.2 Merging can only be done by hand

Discussion in 'Installation, Upgrade, and Import Support' started by florencia, Mar 10, 2014.

  1. florencia

    florencia Active Member

    The custom template is out of date but has been edited more recently than the parent. Merging can only be done by hand.

    what do I need to do to merge by hand? I'm not a code expert. There isn't any addon for this?
     
  2. Brogan

    Brogan XenForo Moderator Staff Member

    You will need to compare your edited template with the default template and merge your customisations into it.
     
  3. florencia

    florencia Active Member

    yes, but how do i merge it? i don't understand. can you do it for me?
     
  4. Brogan

    Brogan XenForo Moderator Staff Member

    Copy your customisations to the new default template.
     
  5. florencia

    florencia Active Member

    in outdated i have form.css and xenforo.css, i select all copy, fo to default and select all and paste it. but i still see them on outdated.
     
  6. Brogan

    Brogan XenForo Moderator Staff Member

    Take a backup of your custom (outdated templates).
    Revert the outdated templates.
    Add your customisations back to the templates.
     
  7. mistypants

    mistypants Well-Known Member

    When this happens to me I find using something like DiffNow very useful. However, it seems you're editing CSS templates -- it's a lot easier to customize the CSS through EXTRA.css.
     
    Amaury likes this.
  8. florencia

    florencia Active Member

    the diffnow is very cool mistypants, thank you. I will try to find some info on how to work with extra.css - I just create this file and copy and paste the code I want to change and it will have priority over the other css templates?
     
  9. tommydamic68

    tommydamic68 Well-Known Member

    What happens if you just leave them as is and do not merge by hand ?
     
  10. Brogan

    Brogan XenForo Moderator Staff Member

    They will remain outdated.
     
  11. tommydamic68

    tommydamic68 Well-Known Member

    And what effects on the site?
     
  12. Brogan

    Brogan XenForo Moderator Staff Member

  13. tommydamic68

    tommydamic68 Well-Known Member

  14. florencia

    florencia Active Member

    good point. I was also confused. I just saved the templates without doing anything and the merge message now its gone. No idea what I did. Its very confusing to do all this manually. You have to be a full time developer to manage Xenforo and the styles, and addons, and upgrades and setting up pages with HTML code. :( I wish it was more like word press, specially the page editor wisiwig.
     
  15. tommydamic68

    tommydamic68 Well-Known Member

    If you used the merge feature, I believe your custom changes would still be there but just merged into the new updated template. If you "reverted" the template only, any custom changes would not be saved.
     
  16. tommydamic68

    tommydamic68 Well-Known Member

    the problem here is, how do you distinguish templates edits from Xenforo updates, to add ons, from my own edits. Unless I was a computerized robot, how could you possibly know what changes I made a year ago. The system seems very confusing and not very adaptive…
     
  17. Brogan

    Brogan XenForo Moderator Staff Member

    Only edited templates will ever be marked as outdated.
    Therefore it will only ever be ones which you have edited.

    Have you ever considered being a little more organized and taking notes?
    How do you possibly run and maintain a site with no record of changes you have made?
     
  18. Martok

    Martok Well-Known Member

    You mean, you don't add comments in with any changes you make in templates for ease of tracking and future reference? ;)

    *EDIT* Ninja'd by Brogan

    I add comments in any templates for changes that I make (in fact I add a comment at the start and a comment at the end to show exactly what the edited code is). In addition I keep a separate record of all template edits, so that if there was a disaster and my site was unrecoverable, I could create them all again when starting from scratch.
     
    caliman and tommydamic68 like this.
  19. tommydamic68

    tommydamic68 Well-Known Member

    Good idea @Martok - that should be in the instructions that came in the box...:rolleyes:
     
  20. tommydamic68

    tommydamic68 Well-Known Member

    Luck…?:D
     

Share This Page