Skip to content

Commit

Permalink
Update contributors.md
Browse files Browse the repository at this point in the history
  • Loading branch information
vbrazo committed May 20, 2018
1 parent d0e1460 commit 6394a28
Showing 1 changed file with 23 additions and 0 deletions.
23 changes: 23 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,26 @@ Syntax:
* `MyClass.my_method(my_arg)` not `my_method( my_arg )` or `my_method my_arg`.
* `a = b` and not `a=b`.
* Follow the conventions you see used in the source already.

8. If you need to rebase/update your branch with master, you should follow these steps:
```ruby
# GitHub ID: vbrazo
# Branch: fixes/fix-warnings

git remote -v # Show all Remote Branches
git remote add faker git@github.com:stympy/faker.git # if you don't have the faker remote address yet
git checkout master # switch to the master branch
git reset --hard HEAD~50 # because your branch master might have things that don't need anymore
git pull faker master # now you're good to go
git push -f [your remote address] master # now your master is updated
# in this case it would be git push -f vbrazo master

# if you want to update your fixes/fix-warnings branch after updating your master:
git checkout fixes/fix-warnings
git merge --no-ff master
git status # to see what files have conflicts. Fix the conflicts and commit them
git add .
git commit -m 'Fix merge conflicts with master'
git push -f [your remote address] fixes/fix-warnings
# in this case it would be git push -f vbrazo fixes/fix-warnings
```

0 comments on commit 6394a28

Please sign in to comment.