From ab220dc4474bc53767b8adc3ddf8c582228c52dc Mon Sep 17 00:00:00 2001 From: Christian Schabesberger Date: Tue, 28 Aug 2018 13:01:21 +0200 Subject: [PATCH] Created How to merge a PR (markdown) --- How-to-merge-a-PR.md | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 How-to-merge-a-PR.md diff --git a/How-to-merge-a-PR.md b/How-to-merge-a-PR.md new file mode 100644 index 0000000..90e1aaa --- /dev/null +++ b/How-to-merge-a-PR.md @@ -0,0 +1,10 @@ +1. Create you PR (ideally ask in an issue if that is a good idea what you want to do) +2. Wait for a Maintainer review +3. Do the requested changes +4. Rebase with `dev` if its necessary: +``` +git checkout dev +git pull +git checkout +git rebase dev +``` \ No newline at end of file