The other is my copy (fisharebest/webtrees) - usually called "upstream". One is your copy (sleebooth/webtrees) - usually called "origin", So, your local repository will be linked to two remote repositories at github. "rebase" reapplies you local modifications "on top" of the latest code, rather than merging them into it. The only thing I would suggest is to use "git rebase upstream/master" instead of "git merge upstream/master". en/github/collaborating-.uests/syncing-a-fork Here is the official documentation for keeping your fork up-to-date: Is there anything you can do, Greg, or am I doomed forever to do manual updates?
#WEBTREES UPGRADE TIMEOUT UPDATE#
In this case, you might need to manually update the software or check with the developer if there is no workaround for an automated update that does not require a loop back connection. These connections cannot be enabled on request basis I'm afraid. The reason for this is that a singe badly written script could cause an infinite amount of connections back to the same server, which would be detrimental for the platform. The error regarding cURL is generated due to loop back connections to the same server being disabled on our shared hosting platform. When I asked my ISP if they could anything, they said,
![webtrees upgrade timeout webtrees upgrade timeout](https://i.ytimg.com/vi/6uXr1BRECYo/maxresdefault.jpg)
(I have had the same error the last two upgrades but did manual upgrades. "Download /fisharebest/webtrees/releases./webtrees-2.0.4.zip…ĬURL error 28: Operation timed out after 55000 milliseconds with 11190786 out of 30263235 bytes received (see /libcurl/c/libcurl-errors.html)"