which content wins -- merging into a branch?

[ids]

I am working a store where the are more than one developer working the templates. I have a separate branch that I'll need to merge my changes into a working/primary branch. We have a theme component that will or might have a conflict, but I'm not sure. I would think that if my branch has newer sections they will be added and code isn't overwritten. But, what happens if the code differences are on the same container? An example might be: a div with class="stretch" but the same div in my branch has class="nostretch"? So the real question I have, what are the details of what gets merged and the possibility of code getting lost?

Scott

[Brennan]

There is not any sort of merge conflict identification like a true source code versioning system. If you need that I would recommend you use our command line tool, mmt, and store the master template files in git.

When you do a "merge" in miva you pick and choose which updates from the branch you want to push to production and it will overwrite the affected templates with the changes. So it would be up to you to ensure you don't overwrite something you didn't mean to.

The good news is that there is an easy "undo" since we keep track of every change to every template.

Here are some addiitonal resources:

https://docs.miva.com/miva10/referen...anage_branches

We also have a entire Miva Learn series on these developer tools that is worth checking out if you haven't yet.

[ids]

Thanks Brennan. I am already using MMT Tools. I don't know that the others are using MMT Tools. Conclusion is, this merge will need to be done manually since we wouldn't be using the same repos.

Scott