From 6155338645cde5c67910cb68cf295bf632439938 Mon Sep 17 00:00:00 2001
From: cn <cn@mycrobase.de>
Date: Fri, 14 Aug 2020 11:44:53 +0200
Subject: [PATCH] module: add Make target for rebasing three branch

---
 Makefile | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/Makefile b/Makefile
index 1301337..da8a3b7 100644
--- a/Makefile
+++ b/Makefile
@@ -21,6 +21,17 @@ lint: ## Lint all source code
 test: ## Run all tests
 	poetry run pytest
 
+.PHONY: rebase-three-branch
+rebase-three-branch: ## Rebase the py3 branch with master contents
+	git stash
+	git checkout master
+	git pull
+	git checkout three
+	git rebase -i origin/master
+	git push --force-with-lease
+	git checkout master
+	git stash pop
+
 .PHONY: help
 help: ## Print this help text
 	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-15s\033[0m %s\n", $$1, $$2}'