Workflow using the terminal

If you are used to work inside a terminal, this workflow may help you…

All other conventions and pro tips provided above still apply. Please read all the steps above carefully before following the steps in this section.

1. Cloning locally your forked repo

$ git clone [email protected]:YOUR_GITHUB/angular.io.git

1. Adding upstream “angular.io”

$ git remote add angular.io [email protected]:angular/angular.io.git

1. Fetching and rebasing updates from “angular.io”

$ git fetch angular.io
$ git merge angular.io/master

1. [ProTip] You can add this two commands to your .gitconfig file and create a git alias:

$ nano ~/.gitconfig
[alias]
  angular-cn = !"git fetch angular.io && git merge angular.io/master"

1. And then, in your terminal you can use this new alias:

$ git angular-cn

1. Pushing the new fetched changes from “angular.io” to your forked repo

$ git push origin master

If you encounter conflicts when rebasing, you need to resolve them.