Skip to content

Commit

Permalink
Merge branch 'modular:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
rcghpge authored Feb 8, 2025
2 parents 7907b3b + dff6868 commit 0bd9ea3
Show file tree
Hide file tree
Showing 47 changed files with 7,262 additions and 33,411 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/mojo_feature_request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ body:
- type: markdown
attributes:
value: |
If the request is out of the published roadmap and priorities, please start an [idea](https://github.com/modularml/mojo/discussions/categories/ideas) in GH Discussions to get feedback from the team.
If the request is out of the published roadmap and priorities, please start a [discussion](https://forum.modular.com/) in the Modular Forum to get feedback from the team.
- type: textarea
id: Request
Expand Down
15 changes: 7 additions & 8 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
```

Expand Down Expand Up @@ -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:

Expand Down
21 changes: 11 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@

Mojo is a new programming language that bridges the gap between research
and production by combining Python syntax and ecosystem with systems
programming and metaprogramming features. Mojo is still young, but it is designed
to become the best way to extend Python over time.
programming and metaprogramming features. Mojo is still young, but it is
designed to write blazing-fast code for CPUs, GPUs, and more as part of
the [MAX Platform](https://www.modular.com/max).

This repo includes source code for:

Expand All @@ -25,11 +26,11 @@ This repo includes source code for:

This repo has two primary branches:

- The [`stable`](https://github.com/modularml/mojo/tree/stable) branch, which
- The [`stable`](https://github.com/modular/mojo/tree/stable) branch, which
is in sync with the last stable released version of Mojo. Use the examples
here if you’re using a [release build of Mojo](#latest-released).

- The [`main`](https://github.com/modularml/mojo/tree/main) branch, which
- The [`main`](https://github.com/modular/mojo/tree/main) branch, which
is in sync with the Mojo nightly build and subject to breakage. Use this branch
for [contributions](./CONTRIBUTING.md), or if you're using the latest
[nightly build of Mojo](#latest-nightly).
Expand Down Expand Up @@ -78,7 +79,7 @@ When you clone this repo, you'll be on the `main` branch by default,
which includes code matching the latest nightly build:

```bash
git clone https://github.com/modularml/mojo.git
git clone https://github.com/modular/mojo.git
```

If you want to instead see the source from the most recent stable
Expand All @@ -87,13 +88,13 @@ release, then you can switch to the `stable` branch.
## Contributing

When you want to report issues or request features, [please create a GitHub
issue here](https://github.com/modularml/mojo/issues).
issue here](https://github.com/modular/mojo/issues).
See [here](./CONTRIBUTING.md) for guidelines on filing good bugs.

We welcome contributions to this repo on the
[`main`](https://github.com/modularml/mojo/tree/main)
[`main`](https://github.com/modular/mojo/tree/main)
branch. If you’d like to contribute to Mojo, please first read our [Contributor
Guide](https://github.com/modularml/mojo/blob/main/CONTRIBUTING.md).
Guide](https://github.com/modular/mojo/blob/main/CONTRIBUTING.md).

For more general questions or to chat with other Mojo developers, check out our
[Discord](https://discord.gg/modular).
Expand All @@ -107,6 +108,6 @@ MAX and Mojo usage and distribution are licensed under the

## Thanks to our contributors

<a href="https://github.com/modularml/mojo/graphs/contributors">
<img src="https://contrib.rocks/image?repo=modularml/mojo" />
<a href="https://github.com/modular/mojo/graphs/contributors">
<img src="https://contrib.rocks/image?repo=modular/mojo" />
</a>
Loading

0 comments on commit 0bd9ea3

Please sign in to comment.