How to set up Roll20 as an remote(onetime): git remote add upstream (this will define a new "remote" for your repo, and naming it "upstream" is common practice when it comes to the parent source of your fork.) My repo update workflow: git checkout master (sets you to your master branch if you aren't there already) git pull upstream master (pulls any updates from the main Roll20 repo and saves it on your computer) git push (pushed the updates from your computer to your github repo. And considering how often I do it, I've streamlined it with creating an command alias, together with other git aliases that comes with Oh My Zsh(linux) to simplify my workflow. Yeah, doing things in the command line makes things so much quicker. I'll let you know tomorrow if it works.Ĭassie said: The manual way to do it is my fetching the upstream and merging it into your master.
You can select specific repositories (like the character sheets and api scripts repos) as I did.
It's a chore to do this, but I just found a possible really simple solution (if it works, testing now): Go to that link, and you can install a github app to your account which automatically updates your repositories every hour. Initially it will show you your fork as the base, and the roll20 fork as the other - your need to switch them as described in this step. I've bolded the step which caused me the most confusion. Click “Merge Pull Request” and “Confirm Merge”. Click “Create Pull Request”, give it a name, click “Send Pull Request”. Now you should see changes where your fork needs to play “catch up”. Github first compares the base fork with yours, and will find nothing if you made no changes, so, c lick “switching the base”, which will change your fork to the base, and the original to the head fork. Click “Pull Requests” on the right, then click the “New Pull Request” button. (At the end of this post might be the easiest way, but first, the manual way which I've used several times before): Access your forked repository on Github. If you use Git its pretty easy, but most of us use the Github desktop application, and that's quite a bit more complicated. There are ways to update a fork without deleting and starting over. Sooner or later this will create conflicts. Your own files are up to date, but apart from those, the rest of your fork is frozen at the time you made it, and gets more and more out of date as time goes on. This allows you to work on the repo without the worry of the code or content being updated.The problem is your fork doesnt automatically update. When you do this, none of the updates made to the source repo will be reflected to your forked repo unless you decide to sync the two.
However, when you fork a repository, you're copying the origin repository to your GitHub account instead of your local machine. That is, if other contributors to the repository make any changes, you can pull those changes to your local machine, updating your copy of the repository with all the changes made. When you clone a repo, you copy that repository to your local machine and are essentially subscribing to any updates made to that repo. Cloning vs Forking: What's the Difference? We explain what the difference is, when you may want to fork instead of clone, and how to do it. While the concept of forking a GitHub repository is similar to cloning, there is an important difference between the two. Cloning vs Forking: What's the Difference?.