Production deploy Staging deploy
Nelify production logs Nelify staging logs
File casing Changing the casing on a file will often result in errors on Windows based machines! Be careful when doing this.
SVG versus PNG
Please do not save svg files in assets. Export from figma as small png's. They load faster and have been compatibility with optimization. Some of the svg files we have are > 10mb!
Only save true vectors as svg, never rasters; if you don't know what that is, just save as png, no biggie!
Staging is updated frequently throughout the day. Master is updated at the end of the day from staging.
Push your work to your branch On your branch, you did some work...
git add .git commit -m^1^git push origin your-branch-name
now you want to pull into staging. Good.
To do that, you can checkout staging, and get the most updated version like this:
git checkout staginggit pull origin staging
Pulling staging into staging should go really smooth. All it's doing is updating your version of staging with the newest version of staging that is live. When you do it, you should see a message at the top of the list of files that says Fast forward.
Up to now, we've simply updated our local staging with the updated staging. The above process should be done, at least, once a day.
Pull your branch into local staging Now, you are on the staging branch locally and your staging branch is all up to date. Do this:
git pull origin your-branch-name
Ideally, you'll see another Fast forward^2^ and you can proceed with committing.
Alternatively, you may run into merge conflicts. That's ok, it happens!
In the event of a merge conflict Anytime two people work on the same file during the same time, the potential for a conflict exists.
BUT, VSCode makes it really easy to see and handle such conflicts.
Click on the github icon in VS, review the merge changes (these are the first in the first section) one by one and then decide what the best course of action will be.
Remember, save each file after you resolve the conflict!
Remember, commit each file after you resolve the conflict!
Push your newly updated staging Now, you have an updated staging. After handling any conflicts, don't forget to review the app to make sure nothing unexpected happened.
IF the app looks clean, the changes are good, and your ready to deploy the updated staging server, do this:
git push origin staginggit checkout -b new-branch-name
Notes
^1^ Or git commit if you're using gitmoji with the hook
^2^ Merged using recursive strategy sometimes happens