From 34e99ce88a5ef5cc7c2e0a73cd90f72116399784 Mon Sep 17 00:00:00 2001 From: Charlie Arehart Date: Fri, 21 Jun 2024 06:57:44 -0500 Subject: [PATCH] docs: fix contributing typo's --- website/docs/contributing/git.mdx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/website/docs/contributing/git.mdx b/website/docs/contributing/git.mdx index 4b616d49..b8c7e445 100644 --- a/website/docs/contributing/git.mdx +++ b/website/docs/contributing/git.mdx @@ -9,11 +9,11 @@ import TabItem from "@theme/TabItem"; While we're mostly used to working with source control, working with a fork and making sure we can merge swiftly brings some additional challenges. This page aims to help you out with the things you might -get asked to do, but may be outside of your comfort zone. +get asked to do, but which may be outside of your comfort zone. Sit back, relax and bring your towel. -If you're not comfortable using git from the CLI, we advise to use [GitKraken][kraken]. It's the best cross platform git tool and +If you're not comfortable using git from the CLI, we recommend [GitKraken][kraken]. It's the best cross platform git tool and we've added instructions on how to use it below as well. ## I didn't stick to the conventional commit guidelines @@ -74,7 +74,7 @@ of oh-my-posh with its own remote on GitHub that's not connected to the oh-my-po on top of git functionality, so we need to mimic that situation ourselves. -### Add the remote to you local git repository +### Add the remote to your local git repository -Hover over `Remote` on the left hand side, this will show a `+` button. Click it and select GitHub. There you have the ability to select +Hover over `Remote` on the left-hand side, this will show a `+` button. Click it and select GitHub. There you have the ability to select `jandedobbeleer/oh-my-posh` and name it `upstream`. GitKraken will fetch the remote and you will see all branches underneath `upstream` as you do for your own branches. Right click `upstream`'s `main` branch and select `Rebase onto upstream/main`.