You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
@@ -55,48 +55,21 @@ docker-compose run --rm app vendor/bin/phpdoc-md
55
55
56
56
## The git workflow we use
57
57
58
-
More info here: https://danielkummer.github.io/git-flow-cheatsheet/
58
+
We use the git workflow [Github Flow](https://guides.github.com/introduction/flow/).
59
59
60
-
To start a new feature:
60
+
### Cheatsheet
61
61
62
-
```bash
63
-
git flow feature start <name>
64
-
```
65
-
66
-
To push the feature to Github:
67
-
68
-
```bash
69
-
git flow feature publish <name>
70
-
```
71
-
72
-
To pull the feature from Github:
62
+
#### New feature
73
63
74
64
```bash
75
-
git flow feature pull <name>
65
+
git checkout -b feature/<the-feature>
66
+
git commit # as mush as necessary
67
+
git push origin feature/<the-feature>
68
+
gh pr create --fill
76
69
```
77
70
78
-
Important: As we use pull requests, we just don't use `git flow feature finish <name>` and we just remove the local branch when the PR is merged. More info [here](https://stackoverflow.com/questions/55706856/proper-way-to-use-gitflow-with-pull-requests).
79
-
80
-
To create a release:
81
-
82
-
```bash
83
-
git flow release start vx.x.x
84
-
git flow release publish vx.x.x
85
-
git flow release finish vx.x.x
86
-
```
87
-
88
-
Then create a new release manually in Github or use `gh release create (...)` if you use **gh** cli.
0 commit comments