Commit 86d7ef9d authored by Lee Matos's avatar Lee Matos 🗽

create Learning GitLab with Git training page and update the trainings page link

parent 98bfe317
Pipeline #5223058 passed with stages
in 13 minutes and 10 seconds
......@@ -12,7 +12,7 @@ extra_css:
%h1.text-center Training
We organize training workshops to help your organization implement Git and GitLab quickly.
%h3
%a{href:"learn-gitlab-with-git.html"}Learning GitLab with Git Basics
%a{href:"/training/learn-gitlab-with-git.html"}Learning GitLab with Git Basics
%p This workshop focuses on how the GitLab UI works and how to integrate it and Git into your workflow.
%h3 Git workshop
%p A Git workshop covers Git concepts such as committing, branches, merge requests, merge conflicts, tags, cherry-picking, bisecting and rebasing.
......@@ -32,7 +32,7 @@ extra_css:
%h3 Cost for each workshop is $2,500
%p
Workshops are delivered via web-conferencing and are recorded for up to 20 people.
Each workshop takes approximately 4 hours.
Each workshop takes approximately 2 hours.
%p
And we're open to discussing other materials to cover and other durations.
Please fill out the form below if you are interested.
......
......@@ -13,12 +13,61 @@ extra_css:
Learning GitLab with Git Basics
There are two sessions, 90 minutes each. Session 1 is built around re-enforcing how the UI works, and then paralleling that in the command line. Session 2 focuses on Merge Conflicts in the UI and command line and Git/Hub/Lab Flow.
%h3.text-center
Session 1 (90 Minutes)
Session 1: GitLab UI & Git Command Line (90 Minutes)
%h4
Part 1: The UI
GitLab is software that allows you to do a lot without having to use the command line. In this session, all particiapants will work together to commit code with the instructor and understand the GitLab interface through action and practice.
Part 1: The UI (45 minutes)
%h5
TODO: INSERT VIDEO HERE
GitLab is software that allows you to do a lot without having to use the command line. In this session, all participants will work together to commit code with the instructor and understand the GitLab interface through action and practice.
The UI also includes some advanced git features, and we dive into those topics at the end of the first session when we cover branching and what Git is and how Git fits into the GitLab equation.
INSERT VIDEO HERE.
%h4
Part 2: Command Line (45 minutes)
At this point, it's important to re-enforce how we've been working on the server the whole time, but the power of git comes from working locally (reenforcing the points we covered in the git concepts section). We'll pull the code project down, and show them that it makes a directory locally, and we can see all of the files we made. Instruct them to do the same. Dive into the basic git commands (and git config), and we'll make a change to our files, and You'll push that change up. They can do the same. Go to the server, see the changes as them come in, and explain what happened. Now, you make a change on your branch, push it up, and make the MR. Have them do the same. Reenforce that changes will not go on the server, until they push them. Master won't have changes from their branch until we merge them in. Take the last 5 minutes or so to recap that what we did today, editing code in the UI, editing code remotely, and getting local code remote. This is the end of session one, and they have all had 4 instances of using GitLab with Git. :)
A core part of using Git and GitLab includes using Git locally on your computer to make changes and push these changes to the server. We use the command line (where Git is born and thrives) to make simple changes to some local files and push them to the server. This mirrors the work we did in the UI in the first session and bridges the gap of how GitLab and Git work together.
%h3.text-center
Session 2: Merge Conflicts & Git Flow (90 minutes)
%h4
Part 1: Simple Merge Conflicts in the UI (60 minutes)
%h5
TODO: INSERT VIDEO HERE
In the second session, we recap how the UI works and then dive into a complex topic: Merge Conflicts. A Majority of this session is focused on dealing with Merge conflicts in the UI and then Mirroring that experience in the command line. Since this topic can be more complex, it is lecture based.
%h4
Part 2: Merge Conflicts in the Command Line & Git Flow (30 minutes)
In the second portion of of the training, we focus on Merge conflicts and how they look and act locally in the command line. Since we already saw basic conflicts via the UI it's not as scary and daunting as they can be at first. Merge Conflicts arise from working with multiple developers and we talk about how to build workflows based on Git Flow, GitHub Flow and GitLab flow with examples of each and how they help to make different types of software development workflows easier.
%h3.text-center
Training Resources
%h3
%a{href:"https://docs.google.com/presentation/d/1G5KAZNvZ_iRpz39jf1MvMzKyaFYclZ0LItHoeinlOpU/edit#slide=id.g153a2ed090_0_57"}Learning GitLab with Git Basics Slidedeck
%h3
%a{href:"https://gitlab.com/gitlab-com-trainings/learning-gitlab-with-git-basics/blob/master/README.md"}Trainer's Guide
%br/
.centered-form.training-form
%script{src: "//app-ab13.marketo.com/js/forms2/js/forms2.min.js"}
%form#mktoForm_1068
:javascript
MktoForms2.loadForm("//app-ab13.marketo.com", "194-VVC-221", 1068, function(form) {
form.onSuccess(function(values, followUpUrl) {
form.getFormElem().hide();
document.getElementById('confirmform').style.visibility = 'visible';
dataLayer.push({event: 'mktoLead', mktoFormId: form.getId()});
return false;
});
function getgacid() {
try {
var tracker = ga.getAll()[0];
return tracker.get('clientId');
} catch (e) {
return 'n/a';
}
}
form.vals({
'gacid': getgacid()
});
});
#confirmform{style: "visibility:hidden;"}
%p Submission received! We'll be in touch shortly.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment