Skip to content

Commit 9aabcfe

Browse files
committed
Fix links
1 parent 077698f commit 9aabcfe

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

00-programming-fundamentals/managing-git-branches.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Unless you are making a very small change (like fixing a typo) you probably want
5959
1. Create a new named branch, depending on the group you are working with you might want to stick your name in the branch. If you're named Ada you might do something like: `git checkout -b ada/add-controller-tests` to create a new branch and move to it.
6060
2. Do some work.
6161
3. Push your code to Github: `git push -u origin ada/add-controller-tests`.
62-
4. Create a [Pull Request](#pull-requests).
62+
4. Create a [Pull Request](./pull-requests-for-branches.md).
6363

6464
Generally you will want to keep your branches short lived. This is so that the repository doesn't change too much under you while you are working. Even with a short lived branch you should make sure to merge changes in from `master` regularly.
6565

00-programming-fundamentals/pull-requests-for-branches.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Scroll down to the bottom until you get to the "Merge pull request" box. Click
6161

6262
![A screenshot of the PR merging UI.](images/merge-pull-request.png)
6363

64-
Your PR might say that you aren't ready to merge because there are conflicts with the base branch. In this case you probably need to merge `master` (see [Working with Branches](#working-with-branches)).
64+
Your PR might say that you aren't ready to merge because there are conflicts with the base branch. In this case you probably need to merge `master` (see [Working with Branches](./managing-git-branches.md#working-with-branches)).
6565

6666
## Resources
6767

0 commit comments

Comments
 (0)