Add guidelines for pulling improvements into netlify-deployed clones about hylia HOT 4 OPEN

Hello,

Here is my attempt to update my deployment with the new version (from 0.4.4 to 0.5.0):

git remote add upstream https://github.com/hankchizljaw/hylia.git
git fetch upstream
git checkout master
git rebase 0.5.0
# here I have manually resolved all conflicts (mainly in src/data/*.json for me),
# and marked them resolved with
#    git add <conflicted files>
# and continue with
#     git rebase --continue
git pull
git push

I see in the Deploy log of the Netlify console that the version is now 0.5.0, and I find all the improvements.

It seems to do the trick... but I'm not sure that's the easiest or most efficient way to do it.

from hylia.

These two links

https://help.github.com/en/github/getting-started-with-github/fork-a-repo#keep-your-fork-synced
https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/syncing-a-fork

helped me to upgrade a Netlify-deployed version from v0.6.0 to v0.7.0 without any problems.

I think it's the same solution which @orx57 described.

from hylia.

Good shout. What I'm doing with the releases is listing out file changes, but any ideas to help make things easier for folks are more than welcome in this camp.

from hylia.

I think this route requires a fair bit of git knowledge. I think the trick is documenting various options, including this one, @orx57.

from hylia.