Follow
why is it so hard for me to understand how to run a forked version of mastodon.... i can't figure out how to lift my repo up to the latest mastodon build
fuck git t b q h
@sky https://github.com/YiffLife/mastodon/pull/3 to get master up to date with 3.2.0 to start, and I'll try to apply it to the release branch and see what breaks lol
@sky annddd this one applies to yl dev branch with hopefully your customizations intact??? https://github.com/YiffLife/mastodon/pull/4
@sky Personally I tend to do the following:
$ git remote add upstream https://github.com/ORIGINAL_OWNER/ORIGINAL_REPOSITORY.git
After that I can do
$ git pull upstream master
To pull the master branch from "upstream" into my own branch.
Hope that helps.
@sky do you want me to try and do a PR for your repo?