Issue Completion: Confirm that the issue is marked as 'Done' in the Kanban board, and all sub-tasks are completed.
Code Review: Submit a pull request for the completed issue. Assign a reviewer to conduct a code review.
Testing: Ensure all automated tests associated with the issue pass.
Conflict Resolution: Prior to merging, resolve any merge conflicts between the feature branch and the main branch.
Final Approval: Obtain final approval from the code reviewer or the team lead.
Merge to Main: Merge the feature branch into the main branch through the pull request.
Continuous Integration: Monitor the CI process to ensure the main branch builds successfully post-merge.
Documentation: Update any related documentation as necessary to reflect the changes.
Communication: Notify the team that the merge has been completed.
Completion Criteria:
All steps in the process are documented and followed.
The merged code is stable and does not introduce new bugs or issues to the main branch.
The feature branch is deleted after a successful merge if that's the team's policy.
Process Steps:
Completion Criteria:
All steps in the process are documented and followed. The merged code is stable and does not introduce new bugs or issues to the main branch. The feature branch is deleted after a successful merge if that's the team's policy.