▶ git remote add upstream git@github.com:freeCodeCamp/freeCodeCamp.git
▶ git remote add timdamra git@github.com:timdamra/freeCodeCamp.git # Needed for me
▶ git remote -v
origin	git@github.com:ojongerius/freeCodeCamp.git (fetch)
origin	git@github.com:ojongerius/freeCodeCamp.git (push)
timdamra	git@github.com:timdamra/freeCodeCamp.git (fetch)
timdamra	git@github.com:timdamra/freeCodeCamp.git (push)
upstream	git@github.com:freeCodeCamp/freeCodeCamp.git (fetch)
upstream	git@github.com:freeCodeCamp/freeCodeCamp.git (push)
▶ git fetch upstream # Get upstream changes
▶ git checkout fix/basicjs_objprops_with_vars # Checkout of your branch
Branch 'fix/basicjs_objprops_with_vars' set up to track remote branch 'fix/basicjs_objprops_with_vars' from 'timdamra'.
Switched to a new branch 'fix/basicjs_objprops_with_vars'

~/repos/freeCodeCamp  fix/basicjs_objprops_with_vars ✔                    25d
▶ git rebase upstream/staging # Finally, rebase!
First, rewinding head to replay your work on top of it...
Applying: fix(challenges): Created a NotFound react component, added a redux
Using index info to reconstruct a base tree...
M	common/app/NotFound/Not-Found.jsx
M	common/app/routes/Challenges/Show.jsx
M	common/app/routes/Challenges/redux/index.js
M	common/app/routes/Challenges/views/quiz/Quiz.jsx
M	common/app/utils/challengeTypes.js
M	seed/challenges/01-responsive-web-design/applied-visual-design.json
M	seed/challenges/02-javascript-algorithms-and-data-structures/basic-javascript.json
Falling back to patching base and 3-way merge...
Auto-merging seed/challenges/02-javascript-algorithms-and-data-structures/basic-javascript.json
Auto-merging common/app/NotFound/Not-Found.jsx
CONFLICT (content): Merge conflict in common/app/NotFound/Not-Found.jsx
error: Failed to merge in the changes.
Patch failed at 0001 fix(challenges): Created a NotFound react component, added a redux
The copy of the patch that failed is found in: .git/rebase-apply/patch

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
# Time for you to manually fix the merge conflict in common/app/NotFound/Not-Found.jsx
# When you are done:
git add common/app/NotFound/Not-Found.jsx
git rebase --continue
git push