merge develop make target

tcgoetz · Feb 19, 2024 · 6a0159e · 6a0159e
1 parent ec2afc5
commit 6a0159e
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/Fit b/Fit
diff --git a/Makefile b/Makefile
@@ -329,4 +329,8 @@ regression_test: clean regression_test_run test
 bugreport:
 	./bugreport.sh
 
-.PHONY: all setup install install_all uninstall uninstall_all update deps create_dbs rebuild_dbs update_dbs clean clean_dbs test zip_packages release clean test test_clean daily flake8 $(SUBMODULES:%=%-flake8)
+
+merge_develop:
+	git fetch --all && git merge remotes/origin/develop
+
+.PHONY: all setup install install_all uninstall uninstall_all update deps create_dbs rebuild_dbs update_dbs clean clean_dbs test zip_packages release clean test test_clean daily flake8 $(SUBMODULES:%=%-flake8) merge_develop
diff --git a/Plugins b/Plugins
diff --git a/Tcx b/Tcx
diff --git a/utilities b/utilities