Skip to content

Commit

Permalink
Merge pull request #1 from cherouvim/patch-1
Browse files Browse the repository at this point in the history
Minor typo by @cherouvim
  • Loading branch information
theodorosploumis committed May 20, 2021
2 parents c45d496 + 3c24d67 commit 94aa755
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@

#### 4.3 VCS - git
- Use a git online UI (GitHub, Gitlab, Bitbucket etc). On the same system add your issues, documentation and [CI](http:https://cgit.drupalcode.org/drupal/tree/core/drupalci.yml) automation workflows.
- Prefer using the [Feature branch workflow](https://www.atlassian.com/git/tutorials/comparing-workflows/feature-branch-workflow) with 1 only master branch, feature specific branches (for tasks and development), pull requests fro feature branches and git tags for live environment and so on.
- Prefer using the [Feature branch workflow](https://www.atlassian.com/git/tutorials/comparing-workflows/feature-branch-workflow) with 1 only master branch, feature specific branches (for tasks and development), pull requests for feature branches and git tags for live environment and so on.

#### 4.4 Drupal scaffolding
- Avoid using the [Drupal core composer.json](http:https://cgit.drupalcode.org/drupal/tree/composer.json) file as the main composer.json file. You may have conflicts when updating drupal core.
Expand Down

0 comments on commit 94aa755

Please sign in to comment.