![hotfixes in master git hotfixes in master git](https://backlog.com/git-tutorial/cn/img/post/stepup/capture_stepup1_5_6.png)
Moves PR out of draft to ready for review.Re-runs javascript tests on local build.Rebases feature branch from target branch (e.g., develop) and builds locally.QA creates system tests tests and open bugs.
HOTFIXES IN MASTER GIT CODE
Developer creates draft PR and requests code review from all core devs, security, release management, and QA.Developer uses Development Milestone Checklist to guide design, development, and unit testing of feature.This will grab the latest code and reattach the feature branch to the new root of develop. Developer frequently rebases feature branch with latest from develop.Developer creates feature branch off of develop or other target branch (e.g., feature/fip6-lock-tokens).The are branched off of the latest release branch for initial testing and the Testnet release. Hotfix branches are for critical issues that need to get into Mainnet immediately. Features are developed in separate branches, promoted to develop for testing, and then promoted to release and master branches in a continuous cycle.įeature/devname(optional)-epic#-fip#-epicname Release branches are created for every major and minor release.Ī feature (or epic) branch is the main unit of work. I.e., you should always be able to hotfix to a release branch. The tip of this branch should be always in the production-ready state for that particular release. The release branch is cut after code freeze to prepare for devnet and Testnet testing. Release branches are stable branches that are currently being released, or have been previously released to Testnet or Mainnet. Before a release branch is cut, develop should be rebased from master to capture any hotfixes to previous releases. The develop branch serves as an integration branch for features, epics, and bugs. The master branch should always reflect what is on Mainnet. Git Branching and Release Strategy Branch