From e8be9a7bd0157875a7b8c89dfdadd588514591ae Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Wed, 18 Apr 2018 14:47:22 -0300 Subject: [PATCH] Remove suggestion to rebase (#899) --- CONTRIBUTING.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 57a387830..f5f82e1c3 100644 --- a/CONTRIBUTING.md +++ b/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