Skip to content

Commit 076184f

Browse files
committed
Switch to GitHub branching flow.
1 parent 2a21277 commit 076184f

File tree

2 files changed

+14
-8
lines changed

2 files changed

+14
-8
lines changed

CONTRIBUTING.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ If there is'nt any issue for the code you are willing to contribute please creat
2727
(please see above).
2828

2929
- **Discussion**
30-
30+
3131
For feature requests, some discussion on the issue will take place to determine
3232
if it's something that should be included or be a user-supplied extensions. It's very
3333
likely that the design of the new feature will also be discussed.
@@ -39,17 +39,17 @@ If there is'nt any issue for the code you are willing to contribute please creat
3939
- **Pull request**
4040

4141
To submit changes to the code, create a [pull request](https://help.github.com/articles/using-pull-requests/)
42-
targeting the branch where the issue should be resolved.
42+
targeting the branch where the issue should be resolved.
4343

4444
For new features, the `dev` branch should be targeted.
45-
For bug fixes, the `hotfixes/<version>` branch should be the target of the pull request.
45+
For bug fixes, the `hotfixes/<version>` branch should be the target of the pull request.
4646
See [A successful Git branching model](https://nvie.com/posts/a-successful-git-branching-model/)
4747
for a guide on how our branching model works.
4848

4949
Pull requests need to pass the CI build and should include unit tests to verify the work.
5050

5151
- **Code review**
52-
52+
5353
Before the code is integrated, there will be a review by any of the project members. Some iteration may
5454
take place requiring updates to the pull reuqest. For example, adding tests, fixing some errors, ...
5555

@@ -67,8 +67,8 @@ By contributing documentation or code to the AppCore project, you assert that:
6767

6868
## Coding
6969

70-
The AppCore .NET project uses [A successful Git branching model](https://nvie.com/posts/a-successful-git-branching-model/)
71-
for handling releases. Please make sure your pull request targets the correct branch.
70+
The AppCore .NET project uses simple GitHub branching model for handling releases.
71+
Please make sure your pull request targets the correct branch.
7272

7373
For versioning our libraries and packages we use [semantic versioning](https://semver.org/). Release versions
7474
are calculated from the branching history of the repository, using [GitVersion](https://gitversion.net/).

GitVersion.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
assembly-versioning-scheme: Major
2+
assembly-file-versioning-scheme: MajorMinorPatchTag
23
assembly-informational-format: '{SemVer}+{ShortSha}'
3-
mode: ContinuousDeployment
4-
branches: {}
4+
continuous-delivery-fallback-tag: 'alpha'
5+
mode: 'ContinuousDeployment'
6+
branches:
7+
main:
8+
increment: Minor
9+
pull-request:
10+
tag: 'pr'
511
ignore:
612
sha: []

0 commit comments

Comments
 (0)