You may need to refer to materials contained under the links above to complete workshop tasks.
You may need to be a member of this organization to exercise using this repo.
Workshop contents
Do not use Git GUI clients to complete the tasks in this workshop.
If you completing the workshop tasks on your own and cannot complete either of the tasks, please, consult the materials above.
git flow basics
Comprehend the benefits of having master branch for release quality code only, dev branch to aggregate contributions from multiple developers and topic branches (fea-*, fix-*) to scope the ongoing work.
Read this article that will give you ideas on the above.
Coding and initializing a pull request
clone this repo
from dev create a feature branch with name following the pattern nn-fea01 where nn is your initials (to distinguish an author when repo history is logged)
create a file profile.md under your personal sub-directory (see examples in dev or in master)
open profile.md, add some text (using markdown notation) and save
commit with a meaningful message (see examples other than Merge pull request... commits)
push your changes upstream
PR and Merge
navigate to this repo on GitHub
open a Pull Request where base branch is dev and compare branch is your feature branch
and making sure it has a meaningful title so that it is clear what the PR is about from the list of PRs
Find a peer from among repo members and ask to make a code review. The reviewer will give a positive feedback - both on some text in your file and overall, and will merge the changes into dev.
It is good when someone asks you to make a code review on their PR. Find an open PR and contact the author. Once agreed assign yourself as a Code reviewer (right sidebar of a pull request). Give some positive feedback on their code/text and approve the PR with an overall positive feedback.
Before you take part in a workshop
You may need to refer to materials contained under the links above to complete workshop tasks.
You may need to be a member of this organization to exercise using this repo.
Workshop contents
Do not use Git GUI clients to complete the tasks in this workshop.
If you completing the workshop tasks on your own and cannot complete either of the tasks, please, consult the materials above.
git flow basics
Comprehend the benefits of having
masterbranch for release quality code only,devbranch to aggregate contributions from multiple developers and topic branches (fea-*,fix-*) to scope the ongoing work.Read this article that will give you ideas on the above.
Coding and initializing a pull request
devcreate a feature branch with name following the patternnn-fea01wherennis your initials (to distinguish an author when repo history is logged)profile.mdunder your personal sub-directory (see examples indevor inmaster)profile.md, add some text (using markdown notation) and saveMerge pull request...commits)PR and Merge
devand compare branch is your feature branchFind a peer from among repo members and ask to make a code review. The reviewer will give a positive feedback - both on some text in your file and overall, and will merge the changes into
dev.It is good when someone asks you to make a code review on their PR. Find an open PR and contact the author. Once agreed assign yourself as a Code reviewer (right sidebar of a pull request). Give some positive feedback on their code/text and approve the PR with an overall positive feedback.
Look for examples among closed PRs
Cleaning up and releasing
At the end of Workshop the repo maintainer:
Learnings
Note how entangled history graph is
In the following modules you will learn some techniques of keeping history linear that is easier to follow.