From cd4de1a156cb5d5f48ebfa9fee882b685bd16d48 Mon Sep 17 00:00:00 2001 From: Daniel Thoren Date: Mon, 12 Apr 2021 12:30:50 +0200 Subject: [PATCH] Update README.md --- README.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0fbae4c..c0602cb 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ pipenv run python . ## Git Flows > In progress! 🚧 -### New Development Flow +#### New Development Flow ``` # clone repo with local_name enables several clones git clone @@ -66,7 +66,12 @@ git checkout # switched branch: branch out from git checkout git branch -git push --set-upstream origin feature/sql-and-xml-validation +git push --set-upstream origin +``` + +#### Comparing / Merging two branches +``` +git merge --no-commit --no-ff ``` ## Repo Badges