This document outlines the process for task development and integration using Git for a software development sprint. It details the steps for creating feature branches for each task, developing code on those branches, merging updates from the master branch, submitting code for review via merge requests, and marking tasks as complete once merged. It also provides an overview of the stand up meeting for week 1 of sprint 1, including tasks worked on by each team member and roadblocks. Deliverables include branches for in-progress tasks in Gitlab and a PDF with the stand up meeting overview uploaded to the team's Gitlab repository with access for the lab assistant.
This document outlines the process for task development and integration using Git for a software development sprint. It details the steps for creating feature branches for each task, developing code on those branches, merging updates from the master branch, submitting code for review via merge requests, and marking tasks as complete once merged. It also provides an overview of the stand up meeting for week 1 of sprint 1, including tasks worked on by each team member and roadblocks. Deliverables include branches for in-progress tasks in Gitlab and a PDF with the stand up meeting overview uploaded to the team's Gitlab repository with access for the lab assistant.
This document outlines the process for task development and integration using Git for a software development sprint. It details the steps for creating feature branches for each task, developing code on those branches, merging updates from the master branch, submitting code for review via merge requests, and marking tasks as complete once merged. It also provides an overview of the stand up meeting for week 1 of sprint 1, including tasks worked on by each team member and roadblocks. Deliverables include branches for in-progress tasks in Gitlab and a PDF with the stand up meeting overview uploaded to the team's Gitlab repository with access for the lab assistant.
This document outlines the process for task development and integration using Git for a software development sprint. It details the steps for creating feature branches for each task, developing code on those branches, merging updates from the master branch, submitting code for review via merge requests, and marking tasks as complete once merged. It also provides an overview of the stand up meeting for week 1 of sprint 1, including tasks worked on by each team member and roadblocks. Deliverables include branches for in-progress tasks in Gitlab and a PDF with the stand up meeting overview uploaded to the team's Gitlab repository with access for the lab assistant.
and integration of information systems Laborator 7
Sprint 1 (Week 1- Stand Up Meeting)
S.l. Dr. Eng. Claudia Pop
Conf. Dr. Eng. Ionut Anghel Technical University of Cluj-Napoca Eng. Bianca Giosan Faculty of Computer Science and Eng. Bianca Goia Automation Department of Computer Science 2020 Task Development (Step 1)
1. For each task assigned, the responsible team member will create one corresponding GIT branch (from master) specifying the task number and a short description Create new branch in Gitlab with : “feature/TaskNumber” Move to the newly created branch, locally by using in Git bash: ➢ git pull ➢ git checkout feature/TaskNumber
Ref: https://www.freecodecamp.org/news/an- introduction-to-git-merge-and-rebase-what-they-are- and-how-to-use-them-131b863785f/ Task Development (Step 2)
2. Start developing… The code developed (GIT commits ) will be pushed only on this branch
Add , Commit and Push the local changes to the remote branch ➢ git add . ➢ git commit -m “short description of your work " ➢ git push origin feature/TaskNumber Task Development (Step 3)
3. When the task is done the code will be reviewed and if everything is ok, the branch will be merged in the master branch
In your branch you need to merge the last master updates (synchronize your branch with the latest modifications from the master branch, if any) !!! Be careful not to loose your work in the process, in case the merge conflicts are not handled correctly o Get locally the latest modifications from master ➢ git pull origin master o Move back to your branch ➢ git checkout feature/TaskNumber o Merge into your branch the modifications brought from master ➢ git merge master o Fix all the conflicts o Commit and Push your fix to the upstream : ➢ git commit –a –m “short description of the merge" ➢ git push origin feature/TaskNumber Ref: https://www.freecodecamp.org/news/an- introduction-to-git-merge-and-rebase-what-they-are- and-how-to-use-them-131b863785f/ Task Development (Step 3 cntd)
3. When the task is done the code will be reviewed and if everything is ok, the branch will be merged in the master branch (cntd)
Once your branch is merged with the modification from the master branch, from your branch create a Merge Request, and assign your Scrum Master (or another team member as a reviewer) The reviewer can choose to accept or deny the request On Accept, the branch will be merged in Master branch (the developer should check that after the merge in master the task is still functioning correctly => run your code from the master branch) On Reject, the reviewer should specify the problems and what should be fixed before a new Merge Request is issued Task Development (Step 4)
4. When the code is merged in master and fully functional in master ,
the task can be marked as completed on the Sprint board. More Details…
GIT Cheat Sheet
https://www.atlassian.com/dam/jcr:e7e22f25-bba2-4ef1-a197-53f46b6df4a5/SWTM- 2088_Atlassian-Git-Cheatsheet.pdf Stand Up Meeting Overview
Team Member What did you do in the previous week? What will you do next week? Roadblocks
Ion Popescu … … … George Ionescu … … … Deliver:
Platform: Gitlab
1. The Branches corresponding to the tasks marked “In Progress” or further on the Sprint Board, should be visible in Gitlab. 2. Create a PDF document per team, containing the Stand-Up Meeting Overview for the first week of Sprint 1.
3. Upload the document in your team’s repository on Gitlab
4. !!! Make sure that the Lab Assistant has access to your project
