Merge branch 'release-1.1.0'

Bump version to 1.1.0
Merge branch 'myfeature1' into develop
2023-06-30 13:45:52 +02:00 · 2023-06-30 13:15:56 +02:00 · 2023-06-30 13:15:25 +02:00 · 2023-06-30 13:15:23 +02:00 · 2023-06-30 13:15:09 +02:00 · 2023-06-30 13:14:28 +02:00
4 changed files with 25 additions and 1 deletions
--- a/README.md
+++ b/README.md
@@ -1 +1,7 @@
-# sw4m-gitflow
+# sw4m-gitflow 1.1.0
+
+Hello world! This is SW4M!
+
+## Critical bugfix
+
+Oh no. Something went really wrong.
--- a/info.md
+++ b/info.md
@@ -1 +1,5 @@
 # Info
+
+This could be legitimate information. This was written on the `develop` branch. Usually, this branch is for integration purposes, but these commits aim to replicate the structure of the original model.
+
+Something new!
--- a/myfeature1.md
+++ b/myfeature1.md
@@ -0,0 +1,7 @@
+# myfeature1
+
+Feature for future release!
+
+Some content, I guess.
+
+This is done now, too!
--- a/myfeature2.md
+++ b/myfeature2.md
@@ -0,0 +1,7 @@
+# myfeature2
+
+Major feature for next release!
+
+One more commit then this feature is done!
+
+No we are really done here.
Author	SHA1	Message	Date
marvinscham	8573634d3e	Merge branch 'release-1.1.0'	2023-06-30 13:45:52 +02:00
marvinscham	567490384a	Bump version to 1.1.0	2023-06-30 13:15:56 +02:00
marvinscham	3fd3689c11	Merge branch 'myfeature1' into develop	2023-06-30 13:15:25 +02:00
marvinscham	702406145f	Merge branch 'myfeature2' into develop	2023-06-30 13:15:23 +02:00
marvinscham	d86e3dd340	Final changes	2023-06-30 13:15:09 +02:00
marvinscham	8ee2658b6d	Final change	2023-06-30 13:14:28 +02:00
marvinscham	a92a09a69d	Merge branch 'release-1.0.0'	2023-06-30 13:12:49 +02:00
marvinscham	ed34453b48	Another bugfix	2023-06-30 13:12:26 +02:00
marvinscham	10557cb6fa	Bugfix	2023-06-30 13:12:12 +02:00
marvinscham	09b4c9af6f	Changed comment	2023-06-30 13:11:26 +02:00
marvinscham	dbf0d20a42	Merge branch 'develop' into myfeature2	2023-06-30 13:10:53 +02:00
marvinscham	cada1fcded	Further changes	2023-06-30 13:10:02 +02:00
marvinscham	0bdbd02e01	Merge branch 'release-1.0.0' into develop	2023-06-29 19:20:23 +02:00
marvinscham	3ffe9af10d	This might be a bugfix	2023-06-29 19:20:08 +02:00
marvinscham	44f96078ff	Bump doc version to 1.0.0	2023-06-29 19:19:52 +02:00
marvinscham	b4b3216b9b	Merge branch 'myfeature2' into develop	2023-06-29 19:12:27 +02:00
marvinscham	637b41d77a	Finished up feature	2023-06-29 19:11:32 +02:00
marvinscham	57b9746201	Added feature stuff	2023-06-29 19:10:57 +02:00
marvinscham	6181009e78	Merge branch 'hotfix-0.1.1' into develop	2023-06-29 19:09:38 +02:00
marvinscham	a9ea23d3b4	Merge branch 'hotfix-0.1.1'	2023-06-29 19:08:13 +02:00
marvinscham	bb52493e4b	Critical fix	2023-06-29 19:07:58 +02:00
marvinscham	a9fcf88167	added some text	2023-06-29 17:13:31 +02:00
marvinscham	7680b1f102	Init myfeature2	2023-06-29 17:08:00 +02:00
marvinscham	ff0c1caa30	Init myfeature1	2023-06-29 16:58:00 +02:00
marvinscham	ac50fd99e9	Added context info	2023-06-29 16:54:33 +02:00
marvinscham	5f158b63c4	Added branch info	2023-06-29 16:53:43 +02:00
marvinscham	3fb5b77ee3	Added greeting	2023-06-29 16:53:07 +02:00