Skip to content

Commit

Permalink
fix(docs): implement github-flow (#57)
Browse files Browse the repository at this point in the history
  • Loading branch information
luismayta committed Dec 30, 2024
1 parent 98ea985 commit f88797d
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 13 deletions.
2 changes: 2 additions & 0 deletions docs/commands.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ task version:minor
task version:patch
```

## Infrastructure

### Terragrunt

| Field | Description |
Expand Down
16 changes: 8 additions & 8 deletions docs/contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,20 @@ Contributions to base-template are welcome.

Feel free to use all of the contribution options:

- Contribute to base-template repositories on [GitHub](https://github.com/hadenlabs/base-template). See [Git flow](./contribute/github-flow.md).
- Contribute to base-template repositories on [GitHub](https://github.com/hadenlabs/base-template). See [GitHub flow](./contribute/github-flow.md).

## Getting Started

### Development

In general, MRs are welcome. We follow the typical "fork-and-pull" [Git flow](./contribute/github-flow.md).
In general, MRs are welcome. We follow the typical "fork-and-pull" [Github flow](./contribute/github-flow.md).

1. **Fork** the repo on Github
2. **Clone** the project to your own machine
3. **Commit** changes to your own branch using [Git flow](./contribute/github-flow.md)
4. **Push** your work back up to your fork
1. **Fork** the repo on Github
2. **Clone** the project to your own machine
3. **Commit** changes to your own branch using [Github Flow](./contribute/github-flow.md)
4. **Push** your work back up to your fork

5. Submit a **Pull Request** so that we can review your changes
5. Submit a **Pull Request** so that we can review your changes

**NOTE:** Be sure to rebase the latest changes from "upstream" before making a pull request!

Expand Down Expand Up @@ -69,7 +69,7 @@ Examples commit messages:

### Branches

See [Git flow](./contribute/github-flow.md).
See [Github Flow](./contribute/github-flow.md).

### Documentation

Expand Down
8 changes: 7 additions & 1 deletion docs/examples/common.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,10 @@
<!-- Include: ./../disclaimer.md -->
<!-- Include: ac:toc -->

### Common
## Common

### Install Dependencies

```bash
task setup
```
4 changes: 0 additions & 4 deletions docs/roadmap.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,3 @@ You can see the corresponding projects on [base-template](https://github.com/had
### December 2021

## Long Lived Initiatives

These projects don't have an end date. They are something we'll continuously work towards.

- [Better Docs](https://hadenlabs.atlassian.net/wiki)

0 comments on commit f88797d

Please sign in to comment.