@jacwah Seems like all the files I was merging are there, just clicking on the commit link didn't show any of those, but might be because they were images and not text
➜ HTML-Client git:(sections-layout) git checkout sections-layout2
Switched to branch 'sections-layout2'
Your branch is based on 'origin/sections-layout2', but the upstream is gone.
(use "git branch --unset-upstream" to fixup)
➜ HTML-Client git:(sections-layout2) git merge card-images
Updating ae40571..4998a8d
Fast-forward
# bunch of stuff here
➜ HTML-Client git:(sections-layout2) git push origin sections-layout2
Total 0 (delta 0), reused 0 (delta 0)
To github.com/Cardshifter/HTML-Client
The only significant change (besides a few cards being renamed) was the addition of imagePath for all cards in extra-resources/mods/mythos. Please review and see if this is OK to merge.
> It would be good for the future if there was a way for us to easily deploy to a live server (hopefully some day a cardshifter.com:4243 server) only the content of the extra-resources directory, hence allowing updates to game content without having to redeploy or even restart the server.
> Is that already implemented? This was specifically about the extra-resources, does rsync/ftp allow to deploy/upload/update only a specific folder or file?
@jacwah I guess the latter? Say if I updated mythos/chinese.cardset and just wanted to push the updated file to the live server, for any new games starting from there