浏览代码

Remove suggestion to rebase (#899)

Francisco Giordano 7 年之前
父节点
当前提交
e8be9a7bd0
共有 1 个文件被更改,包括 0 次插入1 次删除
  1. 0 1
      CONTRIBUTING.md

+ 0 - 1
CONTRIBUTING.md

@@ -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