triz-docs/docs/workflow/task-workflow/02-merging-and-completing.md

sidebar_position	title
3	Merging & Completing

Merging & Completing

---

Step 9 — Switch to dev to Merge

git checkout dev

Step 10 — Merge the Feature Branch into dev

git merge feature/<task_number>

Because the feature branch was just rebased onto dev, this merge will be a fast-forward and will produce a clean merge commit on top of dev.

Step 11 — Push Both Branches to Remote

Push both the dev branch and the feature branch to remote in one operation from NetBeans, or via the terminal:

git push origin dev
git push origin feature/<task_number>

Both branches must be pushed. Pushing dev makes your work available to the rest of the team. Pushing the feature branch keeps the remote in sync and preserves the full history of the task for reference.

Step 12 — Copy the Merge Commit Hash from Gitea

1. Open Gitea and navigate to the dev branch of the Stock repository.
2. The most recent commit at the top of the branch is the merge commit produced in Step 10.
3. Copy the commit hash shown next to it.

This is the hash that identifies exactly what was merged and when. It is the definitive reference for the work done in this task.

Step 13 — Update the Task on Gitea

Go back to the issue assigned to you and post a comment containing:

• The merge commit hash copied in Step 12
• A description of what was done — what was implemented, any decisions made, anything relevant for the reviewer or for future reference

Example comment:

Commit: a3f1c7d

Implemented the Excel export feature for the stock listing page.
Added a new ExportService class, hooked it into the existing StockController,
and used the aspose-cells library for the file generation.
Tested with datasets of up to 10,000 rows.

Step 14 — Stop the Timer

Stop your timer. The task is complete.