Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: com-lihaoyi/Ammonite
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2.5.8
Choose a base ref
...
head repository: com-lihaoyi/Ammonite
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3.0.0-M0
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Feb 8, 2023

  1. Renamed some occurences of "master" branch with "main"

    Also started development of next major version by creating a 3.0.0-M0 tag
    lefou committed Feb 8, 2023

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    lefou Tobias Roeser
    Copy the full SHA
    a8629b2 View commit details
Showing with 4 additions and 4 deletions.
  1. +4 −4 readme.md
8 changes: 4 additions & 4 deletions readme.md
Original file line number Diff line number Diff line change
@@ -56,7 +56,7 @@ The layout of the repository is roughly:
For more detailed information, check out the internals documentation for
high-level overviews of some interesting facets of the codebase

- [Internals Documentation](https://github.com/com-lihaoyi/Ammonite/tree/master/internals-docs)
- [Internals Documentation](https://github.com/com-lihaoyi/Ammonite/tree/main/internals-docs)

## Common Commands

@@ -106,7 +106,7 @@ While working on an arbitrary `xyz` subproject, `mill -w xyz.test` runs tests af

- Publishing is automatic, controlled by scripts in the `ci/` folder.

- Every commit that lands in master will publish a new
- Every commit that lands in main will publish a new
[unstable version](https://ammonite.io/#UnstableVersions),
that you can already use and download. This includes publishing the unstable version
to maven central to the
@@ -116,12 +116,12 @@ While working on an arbitrary `xyz` subproject, `mill -w xyz.test` runs tests af
instructions to point to it, though the "main" download/install instructions
in the doc-site will not be changed.

- Every commit that lands in master *with a tag* will re-publish a stable version
- Every commit that lands in main *with a tag* will re-publish a stable version
to maven central and upload a new versioned release (using the tag as the
version) and the doc-site is updated so the main download/install instructions
point at the new published stable version.

In general, if you land a change in master, once CI completes (1-2hrs) you
In general, if you land a change in main, once CI completes (1-2hrs) you
should be able to download it via the
[Unstable Version](https://ammonite.io/#UnstableVersions)
instructions and make use of your changes standalone or in an SBT project.