Skip to content

Commit b27c9ee

Browse files
committed
docs: dev branch sync
1 parent 16c5189 commit b27c9ee

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

docs/making-releases.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
- [Use the Latest Dataverse Client Javascript Version](#use-the-latest-dataverse-client-javascript-version)
88
- [Merge "release branch" into "main"](#merge-release-branch-into-main)
99
- [Create a Draft Release on GitHub and Tag the Version](#create-a-draft-release-on-github-and-tag-the-version)
10-
- [Merge "release branch" into "develop"](#merge-release-branch-into-develop)
11-
- [Delete "release branch"](#delete-release-branch)
10+
- [Sync "develop" branch with changes from "main"](#sync-develop-branch-with-changes-from-main)
11+
- [Delete "release branch" and "sync develop" branch](#delete-release-branch-and-sync-develop-branch)
1212

1313
## Introduction
1414

@@ -127,17 +127,17 @@ Go to https://github.com/IQSS/dataverse-frontend/releases/new to start creating
127127

128128
At this point you can send around the draft release for any final feedback. Make corrections to the draft, if necessary. Publish once everything is ok.
129129

130-
## Merge "release branch" into "develop"
130+
## Sync develop branch with changes from main
131131

132132
After merging the release branch into `main`, ensure the develop branch is updated with the latest changes.
133133

134-
Create a pull request to merge the `main` branch into `develop` branch also.
134+
Create a pull request to sync the `develop` branch with the `main` branch. Create the branch from `main` and name it `sync-develop-v[version-number]`.
135135

136-
## Delete "release branch"
136+
This is a good time to revert or adjust any release-specific changes that are **not needed in `develop`**, such as:
137+
- Using the npm version of the latest `@iqss/dataverse-client-javascript` package — check what alpha version is used in `develop` and revert to that version.
138+
- Updating the `E2E_DATAVERSE_IMAGE_TAG` in `workflows/test.yml` — revert it to the value used in `develop` (usually `unstable`).
139+
- Any other release-only changes or configuration updates that should not persist in `develop`.
137140

138-
Once the release process is complete and the `release` branch has been merged into both `main` and `develop`, you can safely delete the `release` branch to keep the repository clean.
141+
## Delete "release branch" and "sync-develop" branch.
139142

140-
- Delete the branch locally from your repository.
141-
- Delete the branch remotely from the remote repository.
142-
143-
This ensures that the `release` branch is no longer present in either your local or remote repositories.
143+
Once the release process is complete and the changes have been merged into both `main` and `develop`, you can delete the `release` branch and the `sync-develop` branch to keep the repository clean.

0 commit comments

Comments
 (0)