Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,15 +102,15 @@ jobs:
run: ./.github/scripts/publish_preflight_check.sh

# We authorize this step with temporary GitHub App installation token that has
# write access to the master branch.
- name: Fast-forward master to dev
# write access to the main branch.
- name: Fast-forward main to dev
run: |
git checkout dev
git pull origin dev
git checkout master
git pull origin master
git checkout main
git pull origin main
git merge dev --ff-only
git push origin master
git push origin main

# See: https://cli.github.com/manual/gh_release_create
- name: Create release tag
Expand All @@ -122,4 +122,4 @@ jobs:
gh release create "$RELEASE_VER" \
--title "Firebase Admin Go SDK $RELEASE_VER" \
--notes "$RELEASE_BODY" \
--target "master"
--target "main"
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@ Great, we love hearing how we can improve our products! Share you idea through o
## <a name="submit"></a>Want to submit a pull request?

Sweet, we'd love to accept your contribution!
[Open a new pull request](https://github.com/firebase/firebase-admin-go/pull/new/master) and fill
[Open a new pull request](https://github.com/firebase/firebase-admin-go/pull/new/main) and fill
Comment thread
lahirumaramba marked this conversation as resolved.
out the provided template.

Make sure to create all your pull requests against the `dev` branch. All development
work takes place on this branch, while the `master` branch is dedicated for released
work takes place on this branch, while the `main` branch is dedicated for released
stable code. This enables us to review and merge routine code changes, without
impacting downstream applications that are building against our `master`
impacting downstream applications that are building against our `main`
branch.

**If you want to implement a new feature, please open an issue with a proposal first so that we can
Expand Down
Loading