On 17/03/16 11:51, Dimitry Sibiryakov wrote: > Can github automatically merge changes from origin to personal forks?
As far as I'm aware, no. When I have forked a project I need to pull my forket repository back to my laptop and work on it there. When changes are made to the master repo, I need to do the following: (once only): git remote add upstream https://github.com/whatever.git I can check this is present by running: git remote -v Then when I need to update my fork on github, I do this: cd my/source/location git fetch upstream ## effectively checks out upstream/master git checkout master ## checks out my master branch git merge upstream/master ## merges upstream changes into mine git push ## Push back to my github fork. At this point my forked repository is equal to, or slightly advanced, if I've done any changes, compared to the master repository. I usually do the above before making any changes, just to try and avoid any conflicts later on. HTH Cheers, Norm. -- Norman Dunbar Dunbar IT Consultants Ltd Registered address: 27a Lidget Hill Pudsey West Yorkshire United Kingdom LS28 7LG Company Number: 05132767 ------------------------------------------------------------------------------ Transform Data into Opportunity. Accelerate data analysis in your applications with Intel Data Analytics Acceleration Library. Click to learn more. http://pubads.g.doubleclick.net/gampad/clk?id=278785231&iu=/4140 Firebird-Devel mailing list, web interface at https://lists.sourceforge.net/lists/listinfo/firebird-devel
