mudhorn/oh-my-posh
1
0
Fork 0
mirror of https://github.com/JanDeDobbeleer/oh-my-posh.git synced 2025-01-14 04:38:00 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

docs: fix contributing typo's

Browse source
This commit is contained in:
Charlie Arehart 2024-06-21 06:57:44 -05:00 committed by GitHub
parent 384204f0f2
commit 34e99ce88a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
website/docs/contributing/git.mdx
View file

@ -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
<Tabs
defaultValue="kraken"
@ -86,7 +86,7 @@ on top of git functionality, so we need to mimic that situation ourselves.
}>
<TabItem value="kraken">
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 <branch> onto upstream/main`.