Skip to content

Latest commit

 

History

History
25 lines (21 loc) · 1.4 KB

exercise-03.md

File metadata and controls

25 lines (21 loc) · 1.4 KB

Exercise 3 - Git flow for Team work

Git Flow - Feature Branching, Hotfix branch and Pull Requests

  • one member register on teamfu.tech and create a project eg "Team Wiki".
  • invite and add the other team members to your project.
  • add a sprint eg "Sprint 02" to your project and add your tickets to this Sprint.
  • add a feature ticket for each team member to update/add a new section.
  • add one hotfix ticket to add/replace to a MIT LICENSE file
  • each team member re-clone the "Team Wiki" repo
  • each team member create a feature branch named after the ticket number of the task in teamfu.tech eg. 456-add_a_azure_section to which they have been assigned.
  • add/modify the wiki as per your respective ticket
  • create a Pull Request (PR) and assign it another team member to approve.
  • ensure that your branch is up to date with master before approving the PR
  • merge one feature branch, then the HOTFIX, then the other feature branches.
  • as a team review and merge each PR
  • use git log --graph --oneline --all or git log --graph to see the commits pushed to your repo.

Exercise Time: 40 Minutes


MIT Licensed and prepared for Varsity College by Cyber-Mint (Pty) Ltd
Teamfu ™ is a trademark of Cyber-Mint (Pty) Ltd.
© Copyright 2022, Cyber-Mint (Pty) Ltd.