Skip to content
English
Sign in
Go to safetynetsolutions.co.uk
  • There are no suggestions because the search field is empty.

Process Document for Merging Code

This Process Document is intended for internal use and auditor info only

merging code into a production branch using DevOps for SafetyNet Solutions:

1. Create a Feature Branch

  • Purpose: Isolate new features or bug fixes.
  • Naming Convention: Use a consistent naming convention like feature/feature-name or bugfix/description.

2. Develop and Test Locally

  • Develop: Implement your changes in the feature branch.
  • Local Testing: Ensure all changes pass local tests before pushing to the remote repository  -  dev.skyvisitor.cloud

3. Push to Remote Repository

  • Push: Push your feature branch to the remote repository.
  • CI/CD Pipeline: Trigger the CI/CD pipeline to run automated tests and builds.

4. Create a Pull Request (PR)

  • PR Creation: Create a pull request to merge the feature branch into the main branch.
  • Review Process: Assign reviewers and ensure the PR meets all code quality and testing standards.

5. Code Review and Approval

  • Review: Reviewers check the code for quality, functionality, and adherence to coding standards.
  • Approval: Once approved, the PR can be merged.

6. Merge into Main Branch

  • Merge: Merge the feature branch into the main branch using the pull request.
  • Automated Tests: Ensure all automated tests pass after merging.

7. Deploy to Staging Environment

  • Staging Deployment: Deploy the main branch to a staging environment for further testing.
  • Manual Testing: Conduct manual testing to ensure everything works as expected.

8. Final Approval for Production

  • Approval: Get approval from stakeholders and final sign off by Director for production deployment.

9. Merge into Production Branch

  • Merge: Merge the main branch into the production branch.
  • Automated Deployment: Trigger the automated deployment process to deploy the code to the production environment.

10. Monitor and Rollback if Necessary

  • Monitoring: Monitor the production environment for any issues.
  • Rollback: If issues are detected, rollback to the previous stable version.

11. Post-Deployment Review

  • Review: Conduct a post-deployment review to identify any issues and improve the process.

This process ensures that code changes are thoroughly tested and reviewed before being deployed to production, maintaining high quality and stability