From 53c40912cc1ffbb1e890612783fbc162fce642c6 Mon Sep 17 00:00:00 2001 From: Federico Felici <federico.felici@epfl.ch> Date: Mon, 15 Jul 2019 12:15:29 +0000 Subject: [PATCH] Update README --- README | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/README b/README index 1b203962..7edeb69f 100644 --- a/README +++ b/README @@ -7,7 +7,11 @@ git-hosted version currently under development for automated tests etc. ## Policy for contributing * `master` branch is protected, changes can only be made via merge requests. * To propose changes: - * Open an issue to discuss the matter (please give link/explanation how to do that) - * Then open a branch to work on the issue (please give command to execute) - * When done, submit a merge request to the master branch. (please give series of commands to execute, examples, like "make changes", add, push, if tests passed ask for merge with command to do) - + * Open an issue to discuss the matter (in gitlab project page -> issues) + * Then open a branch to work on the issue. There are several ways to do this: + * Click on 'create branch' on the issue page on gitlab (then `git fetch` and `git checkout <branchname>`) + * In your local space, do `git checkout -b <branchname>` to create a new branch from your current `HEAD`. + * When done, `git push` the branch and submit a merge request. + * The link to open the merge request is shown following the commit. + * Assign someone (other than yourself) to review the merge request. + * Follow up on any questions/comments and optionally amend your branch (and re-push) to fix any new issues that arise. \ No newline at end of file -- GitLab