From ea6481e8400923bbd8759033fb730bfd5818a98d Mon Sep 17 00:00:00 2001 From: Rustam Atai Date: Thu, 19 May 2022 07:46:40 +0100 Subject: [PATCH] Fix links and add question about branch strategies (#242) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Атаи Рустам Бахтиярович --- exercises/git/README.md | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/exercises/git/README.md b/exercises/git/README.md index f827096..1abd82f 100644 --- a/exercises/git/README.md +++ b/exercises/git/README.md @@ -4,9 +4,9 @@ |Name|Topic|Objective & Instructions|Solution|Comments| |--------|--------|------|----|----| -| My first Commit | Commit | [Exercise](exercises/git/commit_01.md) | [Solution](exercises/git/solutions/commit_01_solution.md) | | -| Time to Branch | Branch | [Exercise](exercises/git/branch_01.md) | [Solution](exercises/git/solutions/branch_01_solution.md) | | -| Squashing Commits | Commit | [Exercise](exercises/git/squashing_commits.md) | [Solution](exercises/git/solutions/squashing_commits.md) | | +| My first Commit | Commit | [Exercise](commit_01.md) | [Solution](solutions/commit_01_solution.md) | | +| Time to Branch | Branch | [Exercise](branch_01.md) | [Solution](solutions/branch_01_solution.md) | | +| Squashing Commits | Commit | [Exercise](squashing_commits.md) | [Solution](solutions/squashing_commits.md) | | ## Questions @@ -62,6 +62,18 @@ There are different ways to check whether a file is tracked or not: ### Branches +
+What's is the branch strategy (flow) you know?
+ +* Git flow +* GitHub flow +* Trunk based development +* GitLab flow + +[Explanation](https://www.bmc.com/blogs/devops-branching-strategies/#:~:text=What%20is%20a%20branching%20strategy,used%20in%20the%20development%20process). + +
+
True or False? A branch is basically a simple pointer or reference to the head of certain line of work