Skip to content

Commit dab53ea

Browse files
committed
run format
1 parent e21a435 commit dab53ea

1 file changed

Lines changed: 9 additions & 6 deletions

File tree

devel/contributing.md

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,20 @@ Changes should be made on a new branch. The new branch should be merged to the m
1515
After the pull request has been approved and merged to main, follow the Github process for [creating a new release](https://docs.github.com/en/repositories/releasing-projects-on-github/managing-releases-in-a-repository). The release must follow semantic versioning (ex: vX.Y.Z). This will kick off a new pipeline execution, and the action will automatically be published to the GitHub Actions Marketplace if the pipeline finishes successfully. Check the [GitHub Marketplace](https://github.com/marketplace/actions/setup-matlab) and check the major version in the repository (ex: v1 for v1.0.0) to ensure that the new semantically versioned tag is available.
1616

1717
<<<<<<< HEAD
18+
1819
## Adding a Pre-Commit Hook
1920

2021
You can run all CI checks before each commit by adding a pre-commit hook. To do so, navigate to the repository root folder and run the following commands:
2122

22-
_bash (Linux/macOS)_
23-
=======
23+
# _bash (Linux/macOS)_
24+
2425
## Adding a pre-commit hook
2526

2627
You may choose to run all CI checks before each commit by adding a pre-commit hook. To do so, navigate to the repository root directory, and run the following commands:
2728

2829
_bash (Unix/macOS)_
29-
>>>>>>> 1cc85ef (rebase)
30+
31+
> > > > > > > 1cc85ef (rebase)
3032
3133
```sh
3234
echo '#!/bin/sh' > .git/hooks/pre-commit
@@ -49,8 +51,9 @@ Add-Content .git\hooks\pre-commit 'npm run ci'
4951
```
5052

5153
> **Note:**
52-
<<<<<<< HEAD
54+
> <<<<<<< HEAD
5355
> Git hooks are not version-controlled, so you need to set up this hook for each fresh clone of the repository.
54-
=======
56+
> =======
5557
> Git hooks are not version-controlled, so you’ll need to set up this hook for each fresh clone of the repository.
56-
>>>>>>> 1cc85ef (rebase)
58+
>
59+
> > > > > > > 1cc85ef (rebase)

0 commit comments

Comments
 (0)