Skip to content
This repository was archived by the owner on Dec 21, 2024. It is now read-only.

Commit b6b248f

Browse files
committed
Update README.md to mention main branch
We're now using the local `main` branch to synchronize with the upstream `master` branch.
1 parent c15e2e9 commit b6b248f

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

README.md

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
11
# Xamarin notes
22

3-
The canonical repository (`upstream`) for this fork is https://android.googlesource.com/platform/external/sqlite/
4-
`master` branch here is kept in sync with the upstream, if you need to update you can do it by adding a remote and
3+
The canonical repository (`upstream`) for this fork is
4+
https://android.googlesource.com/platform/external/sqlite/
5+
6+
The `main` branch here is kept in sync with the upstream `master` branch,
7+
if you need to update you can do it by adding a remote and
58
merging its master branch into ours:
69

710
$ git remote add upstream https://android.googlesource.com/platform/external/sqlite/
811
$ git fetch upstream
912
$ git merge upstream/master
1013
$ git push
1114

12-
We do not use the `master` branch for anything else than to keep it in sync with Google upstream. Whenever there's a
13-
need to update SQLite version a new branch named after the SQLite version should be created off of the `master` branch
14-
and the following procedure should be followed:
15+
We do not use the `main` branch for anything else than to keep it in sync with
16+
Google upstream. Whenever there's a need to update SQLite version a new branch
17+
named after the SQLite version should be created off of the `main` branch and
18+
the following procedure should be followed:
1519

1620
* After the branch is created, download the amalgamation zip from https://sqlite.org/download.html
1721
* Copy the new amalgamation files to both the `dist` and `dist/orig` directories

0 commit comments

Comments
 (0)