From 0b2007b65b5d629f7c343abdc70a336ab42999be Mon Sep 17 00:00:00 2001 From: Niklas Borchers <niklas.borchers@rwth-aachen.de> Date: Thu, 7 Jun 2018 16:21:47 +0200 Subject: [PATCH] Add CHANGELOG --- CHANGELOG | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 CHANGELOG diff --git a/CHANGELOG b/CHANGELOG new file mode 100644 index 0000000..2b661cc --- /dev/null +++ b/CHANGELOG @@ -0,0 +1,18 @@ +General Contribution / Workflow +=============================== + +If changes or adaptions to an instrument driver are implemented, it would be +favourable to do this work on a [new branch](https://git.rwth-aachen.de/LabberI2A/Drivers/branches/new)! +If the work is sufficient to share, generate a merge request ([How-To](https://docs.gitlab.com/ee/gitlab-basics/add-merge-request.html)). + +Merge Request +============= + +When submitting a merge request, do the following things: + +* [] - Update your branch (when checked out) by merging the current master: + ```git checkout <my_branch>; git merge origin/master``` + +* [] - Add a new [merge-request](https://docs.gitlab.com/ee/gitlab-basics/add-merge-request.html) + +* [] - Make sure the description contains a short overview of changes, as well as a list devices you tested your changes with. \ No newline at end of file -- GitLab