{"_id":"571d54d418b3c10e003e55c1","project":"54fb204867c8370d00b5c269","version":{"_id":"571d54d418b3c10e003e55b9","project":"54fb204867c8370d00b5c269","hasDoc":true,"hasReference":true,"__v":3,"createdAt":"2016-04-24T23:20:52.805Z","releaseDate":"2016-04-24T23:20:52.805Z","categories":["571d54d418b3c10e003e55ba","571d54d418b3c10e003e55bb","571d54d418b3c10e003e55bc","586982e31c8ac62300359a78","5869833f6dab552500c677cb"],"is_deprecated":false,"is_hidden":false,"is_beta":false,"is_stable":true,"codename":"","version_clean":"2.0.0","version":"2.0"},"category":{"_id":"571d54d418b3c10e003e55bb","version":"571d54d418b3c10e003e55b9","__v":0,"project":"54fb204867c8370d00b5c269","sync":{"url":"","isSync":false},"reference":false,"createdAt":"2015-03-08T00:17:00.405Z","from_sync":false,"order":1,"slug":"development","title":"Development"},"user":"54fb2a5f3dc1790d00b54206","__v":2,"parentDoc":null,"updates":[],"next":{"pages":[],"description":""},"createdAt":"2015-03-08T00:26:36.977Z","link_external":false,"link_url":"","githubsync":"","sync_unique":"","hidden":false,"api":{"settings":"","results":{"codes":[]},"auth":"required","params":[],"url":""},"isReference":false,"order":0,"body":"Once you make a pull request and it has been accepted, you should pull the changes others have made back into your own fork to keep it up-to-date. These simple steps will merge the csblogs master branch into your fork's master branch.\n\nOpen the terminal/git shell and change directory into the csblogs repository. Then, enter the following:\n[block:code]\n{\n  \"codes\": [\n    {\n      \"code\": \"git fetch upstream\\ngit checkout master\\ngit merge upstream/master\",\n      \"language\": \"shell\"\n    }\n  ]\n}\n[/block]\nIf you get the message:\n\n\tfatal: 'upstream' does not appear to be a git repository\n\nIt means your git config does not have a record of 'csblogs/master'. You need to execute the following command (with the URL of the repo you're working on) and try again. For example:\n[block:code]\n{\n  \"codes\": [\n    {\n      \"code\": \"git remote add upstream https://github.com/csblogs/feed-downloader.git\",\n      \"language\": \"shell\"\n    }\n  ]\n}\n[/block]\nThat's it! You'll still need to sync your local branch to the web using a Git GUI/terminal. Now you can continue to write code based on the latest version of the CS Blogs source.","excerpt":"","slug":"keeping-your-fork-in-sync","type":"basic","title":"Keeping your fork in sync"}

Keeping your fork in sync


Once you make a pull request and it has been accepted, you should pull the changes others have made back into your own fork to keep it up-to-date. These simple steps will merge the csblogs master branch into your fork's master branch. Open the terminal/git shell and change directory into the csblogs repository. Then, enter the following: [block:code] { "codes": [ { "code": "git fetch upstream\ngit checkout master\ngit merge upstream/master", "language": "shell" } ] } [/block] If you get the message: fatal: 'upstream' does not appear to be a git repository It means your git config does not have a record of 'csblogs/master'. You need to execute the following command (with the URL of the repo you're working on) and try again. For example: [block:code] { "codes": [ { "code": "git remote add upstream https://github.com/csblogs/feed-downloader.git", "language": "shell" } ] } [/block] That's it! You'll still need to sync your local branch to the web using a Git GUI/terminal. Now you can continue to write code based on the latest version of the CS Blogs source.