- Fork the repo
- Make commits to a branch
- rebase upstream changes into your branch
- submit a pull request
Add an upstream remote. This will help you pull in changes from the base fork
$ git remote add upstream https://github.com/jasonshark/angular-starter
Create a git branch and change into it
$ git checkout -b `your-branch-name`
Once in the branch with your changes pull in any changes that happened upstream with rebase
$ git pull --rebase upstream master
Fix merge conflicts (if any) using git mergetool.
$ git mergetool
To use a GUI instead of VIM you can set the default merge tool to opendiff.
$ git config --global merge.tool opendiff
Continue with the rebase
git rebase --continue
