You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: docs/tutorials/architecture.md
+1-1Lines changed: 1 addition & 1 deletion
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -134,4 +134,4 @@ For more information about writing media linkers, see <a href="write-a-media-lin
134
134
Example Scripts
135
135
----------------
136
136
137
-
Example scripts are located in the <ahref="https://github.com/PixarAnimationStudios/OpenTimelineIO/tree/master/examples"target="_blank">examples subdirectory</a>.
137
+
Example scripts are located in the <ahref="https://github.com/PixarAnimationStudios/OpenTimelineIO/tree/main/examples"target="_blank">examples subdirectory</a>.
Copy file name to clipboardExpand all lines: docs/tutorials/contributing.md
+6-6Lines changed: 6 additions & 6 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -7,8 +7,8 @@ We're excited to collaborate with the community and look forward to the many imp
7
7
8
8
Before contributing code to OpenTimelineIO, we ask that you sign a Contributor License Agreement (CLA). At the root of the repo you can find the two possible CLAs:
9
9
10
-
*[OTIO_CLA_Corporate.pdf](https://github.com/PixarAnimationStudios/OpenTimelineIO/raw/master/OTIO_CLA_Corporate.pdf): please sign this one for corporate use
11
-
*[OTIO_CLA_Individual.pdf](https://github.com/PixarAnimationStudios/OpenTimelineIO/raw/master/OTIO_CLA_Individual.pdf): please sign this one if you're an individual contributor
10
+
*[OTIO_CLA_Corporate.pdf](https://github.com/PixarAnimationStudios/OpenTimelineIO/raw/main/OTIO_CLA_Corporate.pdf): please sign this one for corporate use
11
+
*[OTIO_CLA_Individual.pdf](https://github.com/PixarAnimationStudios/OpenTimelineIO/raw/main/OTIO_CLA_Individual.pdf): please sign this one if you're an individual contributor
12
12
13
13
Once your CLA is signed, send it to `[email protected]` (please make sure to include your github username) and wait for confirmation that we've received it. After that, you can submit pull requests.
14
14
@@ -42,13 +42,13 @@ Now you fetch the latest changes from Pixar's OpenTimelineIO repo like this:
42
42
43
43
```bash
44
44
git fetch upstream
45
-
git merge upstream/master
45
+
git merge upstream/main
46
46
```
47
47
48
-
All the development should happen against the `master` branch. We recommend you create a new branch for each feature or fix that you'd like to make and give it a descriptive name so that you can remember it later. You can checkout a new branch and create it simultaneously like this:
48
+
All the development should happen against the `main` branch. We recommend you create a new branch for each feature or fix that you'd like to make and give it a descriptive name so that you can remember it later. You can checkout a new branch and create it simultaneously like this:
49
49
50
50
```bash
51
-
git checkout -b mybugfix upstream/master
51
+
git checkout -b mybugfix upstream/main
52
52
```
53
53
54
54
Now you can work in your branch locally.
@@ -66,6 +66,6 @@ If all the tests pass and you'd like to send your change in for consideration, p
66
66
git push origin mybugfix
67
67
```
68
68
69
-
Now your remote branch will have your `mybugfix` branch, which you can now pull request (to OpenTimelineIO's `master` branch) using the github UI.
69
+
Now your remote branch will have your `mybugfix` branch, which you can now pull request (to OpenTimelineIO's `main` branch) using the github UI.
70
70
71
71
Please make sure that your pull requests are clean. Use the rebase and squash git facilities as needed to ensure that the pull request is as clean as possible.
0 commit comments