From 528a960fd9d02abbeb2ff37a592e10c8ecb1bbea Mon Sep 17 00:00:00 2001 From: Niklas Borchers <niklas.borchers@rwth-aachen.de> Date: Thu, 7 Jun 2018 16:27:00 +0200 Subject: [PATCH] Update CHANGELOG.md --- CHANGELOG.md | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dac7644..30ac58c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,9 +10,13 @@ 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``` +- [ ] Update your branch (when checked out) by merging the current master: +``` +git checkout <my_branch> +git merge origin/master +git push +``` -- [] - Add a new [merge-request](https://docs.gitlab.com/ee/gitlab-basics/add-merge-request.html) +- [ ] 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 +- [ ] 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