![]() always points to the docs for the latest patch release. The patch release branches are used to maintain the documentation for that patch release. I see a branch called release/vX.Y.Z (e.g., release/v20.03.1). Once they’re in master, cherry-pick the change into the relevant release branches following the steps above. Where should the change go?Īll changes always go into the master branch first. I have a change needed to fix a bug on the release. If the release branch doesn’t yet exist for a major release (e.g., release/v20.07), then you only need to merge your PR into master. Release branches are always cut off of master once the first beta is released. Once the tests pass for your cherry-pick PR, you can merge it in the release branch.įAQ What if the release branch doesn’t exist yet? And, it is very helpful to figure out which branch the change was checked into. That way, the corresponding GitHub issue and Jira ticket gets a reference to your PR. Somewhere in your commit summary/description, you should include mention which GitHub issue or Jira ticket your PR is fixing. When making the GitHub PR, choose the release branch as the base to merge into. Once it’s ready, you can push your branch and then make a PR: $ git push -set-upstream origin danielmai/v20.03-changelog If you need to make changes specific to this release branch, then you can do so now (e.g., to do a bug fix without breaking changes). If you have merge conflicts, resolve them. It appends the original SHA to your cherry-pick commit $ git checkout -b danielmai/v20.03-changelog # make sure you have the latest updates for the release branch (#5447)Ĭheck out the release branch and create a new dev branch to cherry-pick your change: $ git checkout release/v20.03 It has already been reviewed and merged into master. The following example is about cherry-picking PR #5447 into a release branch release/v20.03. Once a release branch is cut, PRs must be made against master, get reviewed, and then get cherry-picked via PR into the release branch. ![]() With calendar versioning, X is the year (“20” is the year 2020) and Y is the zero-padded month (“03” is March, “07” is July, “11” is November). The master branch has all the latest changes and may include breaking changes slated for the next major release. master: The unreleased version of Dgraph.“Master” builds are built from the master branch: release/v1.1: Code for v1.1.0 and further patch releases v1.1.1, v1.1.2, and so on.release/v1.2: Code for v1.2.0 and further patch releases v1.2.1, v1.2.2, and so on.Select the commit you would like to cherry-pick.Official Dgraph releases are created from the following branches: In the list of branches, click the branch that has the commit that you want to cherry-pick. For more information, see Distributed Git - Maintaining a Project in the Git documentation. ![]() Some projects incorporate contributions by cherry-picking commits. ![]() You can also use cherry-picking when collaborating with a team. For example, if you commit a bug fix to a feature branch, you can cherry-pick the commit with the bug fix to other branches of your project. You can also use cherry-picking to apply specific changes before you are ready to create or merge a pull request. If you commit changes to the wrong branch or want to make the same changes to another branch, you can cherry-pick the commit to apply the changes to another branch. You can cherry-pick a commit on one branch to create a copy of the commit with the same changes on another branch.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |