Skip to content

Commit

Permalink
Remove suggestion to rebase (#899)
Browse files Browse the repository at this point in the history
  • Loading branch information
frangio authored Apr 18, 2018
1 parent dd8758f commit e8be9a7
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ Smart contracts manage value and are highly vulnerable to errors and attacks. We
As a contributor, you are expected to fork this repository, work on your own fork and then submit pull requests. The pull requests will be reviewed and eventually merged into the main repo. See ["Fork-a-Repo"](https://help.github.com/articles/fork-a-repo/) for how this works.

*IMPORTANT*
* Please use `rebase` instead of `merge` when updating your fork.
* Please see ["Git flow wiki entry"](https://github.com/OpenZeppelin/zeppelin-solidity/wiki/Git-flow) for understanding how to use branches in this repository.

## A typical workflow
Expand Down

0 comments on commit e8be9a7

Please sign in to comment.