Thread:LadyAlys/@comment-25085701-20160204032731/@comment-24150802-20160209075810

`git fetch upstream` (this pulls down the latest changes from the official repo without applying them)

`git checkout name-of-your-feature-branch` (i.e., move into the branch you want to update)

`git rebase upstream/develop` (this applies the latest changes to the branch you are in)

If there are merge conflicts, you will need to handle them (it will inform you clearly if there are). Tell me if you need advice about that.