git-workflow

You should have 2 repositories
origin - your fork
upstream - main repository

<fork repository>
0. git clone [email protected]:you/project.git
1. git remote add upstream [email protected]:our/project.git
2. git checkout master
3. git pull upstream master
4. git checkout -b my-important-feature
<do-your-job>
5. git add .
6. git commit 'My commit detailed message'
7. git push origin my-important-feature
<send Pull Request at github>
8. Checkout back to master, pull upstream, create new branch

Sync branches
===

You have 2 repositories
origin - your fork
upstream - main repository
 
iteration - branch you've made a PR to
feature - your branch
 
Now you at branch feature.
 
 
1. Update iteration branch.
 
git checkout iteration
git pull iteration
git checkout feature
 
2. Merge iteration branch to feature branch.
 
git merge iteration
 
3. Resolve conflicts. After it:
 
git commit
 
4. Push your changes
 
git push origin/feature