-
Notifications
You must be signed in to change notification settings - Fork 2.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'modular:main' into main
- Loading branch information
Showing
47 changed files
with
7,262 additions
and
33,411 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -222,7 +222,7 @@ for more details. | |
|
||
#### Fork and clone the repo | ||
|
||
Go to the [Mojo repo](https://github.com/modularml/mojo) and click the fork | ||
Go to the [Mojo repo](https://github.com/modular/mojo) and click the fork | ||
button: | ||
|
||
![Create Fork](stdlib/docs/images/create-fork.png) | ||
|
@@ -237,16 +237,16 @@ cd mojo | |
Add the upstream remote and fetch it: | ||
|
||
```bash | ||
git remote add upstream [email protected]:modularml/mojo.git | ||
git remote add upstream [email protected]:modular/mojo.git | ||
git fetch upstream | ||
``` | ||
|
||
#### Branching off nightly | ||
#### Branching off main | ||
|
||
Make sure to branch off `main` to work on your PR: | ||
|
||
```bash | ||
git checkout upstream/main | ||
git checkout main | ||
git checkout -b my-fix-pr | ||
``` | ||
|
||
|
@@ -311,12 +311,11 @@ You'll see a link to create a PR: | |
|
||
```plaintext | ||
remote: Create a pull request for 'my-fix-pr' on GitHub by visiting: | ||
remote: https://github.com/jackos/mojo/pull/new/my-fix-pr | ||
remote: https://github.com/[your-username]/mojo/pull/new/my-fix-pr | ||
``` | ||
|
||
Make sure you point it to the `main` branch: | ||
|
||
![Base Branch](stdlib/docs/images/base-branch.png) | ||
It should automatically set the base branch to the upstream `modular/mojo/main`, | ||
but if it doesn't, you can set it manually. | ||
|
||
Now fill out the details: | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.