Skip to content

Commit 97cd9f8

Browse files
committed
More links fixed
1 parent e6dd2ee commit 97cd9f8

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

docs/git-branching-strategies/githubflow.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ GitHub Flow is a simple and effective branching strategy which the folks at GitH
33

44
GitHub Flow is in a nutshell:
55

6-
1) Update master to latest [upstream](../Reference/gitSetup.md#upstream) code
6+
1) Update master to latest [upstream](../reference/git-setup.md#upstream) code
77
2) Create a feature branch `git checkout -b myFeatureBranch`
88
3) Do the feature/work
9-
4) Push feature branch to [origin](../Reference/gitSetup.md#origin)
9+
4) Push feature branch to [origin](../reference/git-setup.md#origin)
1010
5) Create pull request from origin/<featureBranch> -> upstream/master
1111
6) Review, fix raised comments, merge your PR or even better, get someone else to.
1212

13-
The main rule of GitHub Flow is that master should *always* be deployable. GitHub Flow allows and encourages [continuous deliver](../Reference/Continuous-Delivery.md).
13+
The main rule of GitHub Flow is that master should *always* be deployable. GitHub Flow allows and encourages [continuous deliver](../reference/continuous-delivery.md).
1414

1515
## Resources
1616
- [GitHubFlow guide by GitHub](https://guides.github.com/introduction/flow/index.html)

docs/git-branching-strategies/index.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ When building GitVersion we had to work through not only how to use the branchin
66
## Introduction to branching strategies
77
Git is a very powerful tool and if you do not settle on a branching strategy and associated workflows then you will likely lose work at some point. At the start of any project I recommend picking a branching strategy and making sure your whole team understands it.
88

9-
As mentioned above the GitVersion docs cover GitHubFlow and GitFlow.
9+
As mentioned above the GitVersion docs cover [GitHubFlow](githubflow.md) and [GitFlow](gitflow.md).
1010

1111
### GitHubFlow
1212
GitHubFlow is a simple and powerful branching strategy. It is what GitHub uses and the branching strategy most open source projects use.
1313

14-
- [Mainline development](../Reference/mainline-development.md) on `master`
15-
- Work on [feature branches](../Reference/featureBranches.md), merge into `master` via [pull requests](../Reference/pull-requests.md)
16-
- Works well for [continuous delivery](../Reference/Continuous-Delivery.md)
14+
- [Mainline development](../reference/mainline-development.md) on `master`
15+
- Work on [feature branches](../reference/feature-branches.md), merge into `master` via [pull requests](../reference/pull-requests.md)
16+
- Works well for [continuous delivery](../reference/continuous-delivery.md)
1717
- Does not have a way to manage/maintain old releases
1818
- Only allows working on a single release at a time
1919

@@ -32,4 +32,4 @@ There are a few reasons you would pick GitFlow over GitHubFlow, they are:
3232
2) You need to work on multiple releases at the same time
3333
- For example a new feature which will go in the next major version, while bug fixes/smaller features are still going into the current release
3434

35-
But if you do not have a good reason to go with GitFlow, then start with GitHubFlow. It is a far simpler model and if you end up needing GitFlow later, it is [easy to convert](convertingToGitFlow.md)
35+
But if you do not have a good reason to go with GitFlow, then start with GitHubFlow. It is a far simpler model and if you end up needing GitFlow later, it is [easy to convert](converting-to-gitflow.md)

docs/usage.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ Available on [Chocolatey](http://chocolatey.org) under [GitVersion.Portable](htt
1616
Switches are available with `GitVersion /?`
1717

1818
### Output
19-
By default GitVersion returns a json object to stdout containing all the [variables](variables.md) which GitVersion generates. This works great if you want to get your build scripts to parse the json object then use the variables, but there is a simpler way.
19+
By default GitVersion returns a json object to stdout containing all the [variables](more-info/variables.md) which GitVersion generates. This works great if you want to get your build scripts to parse the json object then use the variables, but there is a simpler way.
2020

21-
`GitVersion.exe /output buildserver` will change the mode of GitVersion to write out the variables to whatever build server it is running in. You can then use those variables in your build scripts or run different tools to create versioned NuGet packages or whatever you would like to do. See [build servers](buildServers.md) for more information about this.
21+
`GitVersion.exe /output buildserver` will change the mode of GitVersion to write out the variables to whatever build server it is running in. You can then use those variables in your build scripts or run different tools to create versioned NuGet packages or whatever you would like to do. See [build servers](build-server-support.md) for more information about this.
2222

2323

2424
## MSBuild Task
@@ -45,7 +45,7 @@ Make sure there is a tag somewhere on master named `v1.2.3` before `HEAD` (chang
4545

4646
Continue working as usual and when you release/deploy, tag the branch/release `v1.2.4`.
4747

48-
If you want to bump up the major or minor version, create a text file in the root directory named NextVersion.txt and inside of it on a single line enter the version number that you want your next release to be. e.g., `2.0`.
48+
If you want to bump up the major or minor version, create a `GitVersionConfig.yaml` file in the root of your repo and inside of it on a single line enter `next-version: <version you want>`, for example `next-version: 3.0.0`
4949

5050
### Why is AssemblyVersion only set to Major.Minor?
5151

0 commit comments

Comments
 (0)