diff --git a/.github/contributing-first-issue.md b/.github/contributing-first-issue.md index e0d89dce2b..274667b1ce 100644 --- a/.github/contributing-first-issue.md +++ b/.github/contributing-first-issue.md @@ -24,7 +24,7 @@ Great question! The short version goes like this: 1. **Switch to the correct branch** - Switch to the `contrib` branch + Switch to the `main` branch 1. **Build** @@ -32,7 +32,7 @@ Great question! The short version goes like this: 1. **Branch** - Create a new branch now and name it after the issue you're fixing, we usually follow the format: `temp-12345`. This means it's a temporary branch for the particular issue you're working on, in this case issue number `12345`. Don't commit to `contrib`, create a new branch first. + Create a new branch now and name it after the issue you're fixing, we usually follow the format: `temp-12345`. This means it's a temporary branch for the particular issue you're working on, in this case issue number `12345`. Don't commit to `main`, create a new branch first. 1. **Change** @@ -42,7 +42,7 @@ Great question! The short version goes like this: Done? Yay! 🎉 - Remember to commit to your new `temp` branch, and don't commit to `contrib`. Then you can push the changes up to your fork on GitHub. + Remember to commit to your new `temp` branch, and don't commit to `main`. Then you can push the changes up to your fork on GitHub. #### Keeping your Umbraco fork in sync with the main repository [sync fork]: #keeping-your-umbraco-fork-in-sync-with-the-main-repository @@ -59,10 +59,10 @@ Then when you want to get the changes from the main repository: ``` git fetch upstream -git rebase upstream/contrib +git rebase upstream/main ``` -In this command we're syncing with the `contrib` branch, but you can of course choose another one if needed. +In this command we're syncing with the `main` branch, but you can of course choose another one if needed. [More information on how this works can be found on the thoughtbot blog.][sync fork ext] diff --git a/.github/contributing-localization.md b/.github/contributing-localization.md index dc8f3fdd47..a13765fa7e 100644 --- a/.github/contributing-localization.md +++ b/.github/contributing-localization.md @@ -115,7 +115,7 @@ Save the changes and return to the Backoffice to see the update. -1. Commit your changes to a new temporary branch (avoid committing directly to `contrib`). +1. Commit your changes to a new temporary branch (avoid committing directly to `main`). 2. Push the changes to your fork on GitHub.