Sign in Register
Copied to clipboard

Flag this post as spam?

This post will be reported to the moderators as potential spam to be looked at


  • Filipe Sousa 43 posts 205 karma points
    Mar 05, 2019 @ 21:02
    Filipe Sousa
    0

    Baselines workflow and merging

    I've been testing deploying from a baseline project to a child with changes to files in both. I found out there are two separate behaviors:

    • Config files: Child changes take precedence. These are merged but if there is a merge conflict the changes from the child project are kept.
    • Other files: Baseline changes take precedence. These are merged but if there is a merge conflict the changes from the baseline project are kept.

    From what I've read, when a file is changed on the child it takes precedence over the baseline which from my experience, depends on the type of file. Also the Baselines documentation isn't clear on this.

    I would just like someone to confirm my findings.

    Copy Link
  • Michael Nielsen 155 posts 812 karma points
    Mar 12, 2019 @ 13:55
    Michael Nielsen
    0

    Hi Filipe

    You are correct.

    If you change config files on a child, it will no longer be updated from Baseline, as it will fall out of sync with the Baseline git respository.

    Recommended approach is to use Config Transforms

    https://our.umbraco.com/documentation/Umbraco-Cloud/Getting-Started/Baselines/Configuration-files/

    Copy Link
Please Sign in or register to post replies

Write your reply to:

Draft