> For the complete documentation index, see [llms.txt](https://cultuurnet.gitbook.io/uitpas-beheer-silex/llms.txt). Markdown versions of documentation pages are available by appending `.md` to page URLs; this page is available as [Markdown](https://cultuurnet.gitbook.io/uitpas-beheer-silex/development-process/git-workflow.md).

# Git workflow

If you follow the agreed git branching model, smooth [peer reviews](/uitpas-beheer-silex/development-process/peer-review.md) and painless deployments are guaranteed.

## Permanent branches

No single change will ever be applied directly on any of the permanent branches. Changes always first mature in temporary branches, until they entirely meet the [Definition of Done](/uitpas-beheer-silex/development-process/definition-of-done.md).

### `master`

* This branch is used on the production environment, and is released periodically.

### `hotfix/hotfix`

* Gets updated with `master` when possible and needed (after each release to production).
* This branch should always kept clean for emergencies.

## Temporary branches

### Feature branches

* Each issue gets its own feature branch.
* All feature branches should be branched from the `master` branch.
* All feature branch pull requests should have `master` as base branch.
* The naming for the feature branches is:

  ```
   feature/{Jira issue-number}
  ```

Examples are:

```
  feature/UBR-100
  feature/UBR-330
```

Only when the [Definition of Done](/uitpas-beheer-silex/development-process/definition-of-done.md) is entirely met, changes are merged back to the `master` branch.

### Hotfix branches

An issue might require a hotfix that needs to be brought to production as soon as possible. All hotfix branches should be branched from the `hotfix/hotfix` branch.

The naming for the hotfix branches is:

```
    hotfix/{Jira issue-number}
```

Examples are:

```
  hotfix/UBR-325
  hotfix/UBR-466
```

Only when the [Definition of Done](/uitpas-beheer-silex/development-process/definition-of-done.md) is entirely met, changes are merged back to the `hotfix/hotfix` and `master` branches.