diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-26 12:09:53 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-26 12:09:53 +0300 |
| commit | 0ccabeb3f62c5fbc81f52cc16fa654404bb87874 (patch) | |
| tree | 27c81cfa9d498fa0b604acaa9c4f5400743f83fd /doc/university/training | |
| parent | 6819cb95c9c0aa63fce1d246026978df5cac9e44 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/university/training')
| -rw-r--r-- | doc/university/training/index.md | 1 | ||||
| -rw-r--r-- | doc/university/training/topics/agile_git.md | 33 |
2 files changed, 4 insertions, 30 deletions
diff --git a/doc/university/training/index.md b/doc/university/training/index.md index f69bd51b341..7aabd6b2757 100644 --- a/doc/university/training/index.md +++ b/doc/university/training/index.md @@ -17,7 +17,6 @@ All training material is open to public contribution. This section contains the following topics: -- [Agile and Git](topics/agile_git.md). - [Bisect](topics/bisect.md). - [Cherry pick](topics/cherry_picking.md). - [Code review and collaboration with Merge Requests](topics/merge_requests.md). diff --git a/doc/university/training/topics/agile_git.md b/doc/university/training/topics/agile_git.md index cb82d3cec64..f912f92fad2 100644 --- a/doc/university/training/topics/agile_git.md +++ b/doc/university/training/topics/agile_git.md @@ -1,33 +1,8 @@ --- -stage: none -group: unassigned -info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments -comments: false +redirect_to: '../../../user/project/issue_board.md' --- -# Agile and Git +Information about using Agile concepts in GitLab can be found in [another location](../../../user/project/issue_board.md). -## Agile - -Lean software development methods focused on collaboration and interaction -with fast and smaller deployment cycles. - -## Where Git comes in - -Git is an excellent tool for an Agile team considering that it allows -decentralized and simultaneous development. - -### Branching And Workflows - -Branching in an Agile environment usually happens around user stories with one -or more developers working on it. - -If more than one developer then another branch for each developer is also used -with their initials, and US ID. - -After its tested merge into master and remove the branch. - -## What about GitLab - -Tools like GitLab enhance collaboration by adding dialog around code mainly -through issues and merge requests. +<!-- This redirect file can be deleted after <2021-07-23>. --> +<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page --> |