Skip to content

Close or Merge feature branch to develop

Igor Usenko edited this page Jun 12, 2022 · 27 revisions

if a branch will be just closed or will be merged

  • verify no uncommitted changes
  • verify that all the needed tests are created (if the branch will be merged)
  • verify that all the tests run by RUN_TEST (if the branch will be merged)
  • verify that all the tests passed (if the branch will be merged)
  • review issue notes, add them as the last comment
  • review all commits notes, add them as the last comment
  • review todos (if the branch will be just closed), add them as the last comment
  • update the used sources

if the branch will be merged

  • update the documentation (checking the diff between develop and feature branches)
  • create missing or update existing doxygen
  • clean up #includes
  • verify no uncommitted changes
  • switch to develop
  • sync local develop with origin
  • merge feature branch to develop
  • build project for watch env
  • run tests
  • sync local develop with origin
  • verify that commits appear in develop origin

if a branch will be just closed or will be merged

  • delete the local feature branch
  • delete the remote feature branch here
  • review todos, create follow up issue(s)
  • review the last comment, create follow up issue(s), add links to the issues to comment and code as well
  • close the related branch issue
Clone this wiki locally