Help with setting up Stag about stag HOT 5 CLOSED

Hmmm... That looks good. I even copied in your config, and it tried to deploy.

Make sure there's not another servers: key in there that is overwriting your config, as stag isn't able to read the config you have listed above for some reason.

If you want to copy in your full config here, I'm happy to take a look.

from stag.

I'll have to take a raincheck. For the moment, I've cobbled together something in Grunt that works adequately. For the record how does Stag handle merge conflicts when deploying with git? I.e., if what happens if I've edited the same file on the live server and on my development machine?

from stag.

Also, thanks for looking into this... I forget my manners sometimes :)

from stag.

Yeah no problemo. I'll close this issue and just re-open if need be.

Stag doesn't handle merge conflicts. If a merge conflict happens that git can't resolve itself, you'll need to manually SSH in and fix whatever needs fixing. This has really only been an issue for us with content. Usually, once a site goes live, we don't edit any content in any other environment except production, and this keeps the conflicts to a minimum.

from stag.

Cool.

I'm planning to be editing content both locally and on the production server and, if I'm feeling exceptionally self-flagellating, on the staging server, as well. Sigh.

So it's possible that Stag wouldn't have been a good fit; though maybe the issue is with my workflow :)

from stag.