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
Scott
Comment