Looks good! I can't merge just yet, though, 'cause Github says there are merge conflicts. You should resolve those, and then you're good to go.
To do that, first make sure you have an "upstream" remote for the official repo (you can check this with git remote -v). If you don't have one, you can add it with:
Looks good! I can't merge just yet, though, 'cause Github says there are merge conflicts. You should resolve those, and then you're good to go.
To do that, first make sure you have an "upstream" remote for the official repo (you can check this with
git remote -v). If you don't have one, you can add it with:Once you have it, pull in the changes from the official master branch. If there are conflicts, Git should tell you how to fix them:
And once you've fixed the conflicts, push to your branch:
Let me know if you have any trouble!