Skip to content

Commit

Permalink
Resolve contribution section linking and display
Browse files Browse the repository at this point in the history
Also resolves an issue with the rebase-guide table of contents.
  • Loading branch information
4mmonium committed Nov 15, 2023
1 parent 827bdbc commit 0e5e38c
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
4 changes: 2 additions & 2 deletions content/docs/contributing/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ title: Contributing
weight: 950
---

- [Git Guides](/docs/contributing/)
- [How you can help](/docs/contributing/how-you-can-help)
- [Git Section (Guides)](/docs/contributing/git)
- [How you can help](/docs/contributing/how-you-can-help)
6 changes: 3 additions & 3 deletions content/docs/contributing/git/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ title: Git
weight: 950
---

# Guides
### Guides

- [Squash Guide](/docs/contributing/git/squash-guide.md): Condense your commits for a cleaner project history.
- [Rebase Guide](/docs/contributing/git/rebase-guide.md): Rebase your commits.
- [Squash Guide](/docs/contributing/git/squash-guide): Condense your commits for a cleaner project history.
- [Rebase Guide](/docs/contributing/git/rebase-guide): Rebase your commits.
4 changes: 3 additions & 1 deletion content/docs/contributing/git/rebase-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@ title: Rebase Guide
weight: 970
---

### Introduction

Rebase or 'rebasing' is great for updating your branch to be up-to-date with another branch, this is done by picking a new 'base' for your working branch and apply all the changes you made on top. This is ideal when you made changes, let's say, a year ago and merging those are no longer viable as a result of merge conflicts or it would no longer be called if it was actually merged. You can rebase it instead, resolve any merge conflicts, test if it still works, and update or apply for another pull-request.

#### To clarify:
**To clarify:**

- Rebasing does not change the content of the original commits in the master branch (or the commits thereof).
- Rebasing adds new commits on top of the master branch, effectively extending the branch's commit history with the changes from the feature branch.
Expand Down

0 comments on commit 0e5e38c

Please sign in to comment.