Consciously keeping changes
Read status and diff, note appropriate changes and create a comprehensible commit. Detect unintentional files and confidential configurations before committing.
Git training for development teams
Understand changes · Resolve conflicts · Check code together
Practice the git steps that are needed in the team on a daily basis. From comprehensible commits to branches to the merge conflict, a common process is created that everyone can understand. For developers and technical teams who want to work more securely together on code.
- 3 hours
- Remote remote
- Up to 6 persons
Your teacherMatthias Gläßner Senior web developer for TYPO3 and PHP · TYPO3 lecturer at GFUFounder and owner of Seitenreport · 18+ years of experience
What your team can do better afterwards
- Differentiate working directory, scheduled changes and commit history.
- Prepare small, understandable changes on your own branch.
- Resolve a merge conflict in terms of content and then examine the result.
- Remove split changes in a comprehensible manner and set common review rules.
A Possible Agenda for Your Team Date
These priorities are the starting point. Order, practice depth and examples are tailored to your learning goal before assignment.
Working in parallel
Create a feature branch, exchange changes and solve a prepared conflict together. In doing so, we distinguish the technical merge from the professional decision about the content.
Practice review and correction
Prepare a small change as a review, incorporate feedback and take back an already shared change in a traceable way. Record rules for branches and commit size in your own team.
Joint application
Two changes, one conflict
Two team members change the same section in different branches. Together, they resolve the conflict, examine the merged version and justify in the review why both requirements are still met.
Make practice time work for your team
Participants can edit files in the editor and execute simple commands. Git is installed; an exercise repository is available. Programming skills help to read changes, but are not a mandatory requirement for the basic Git exercises.
The agreed scope
Bookable as a separate half-day or as a planned component of a TYPO3 or deployment training. When combined, the team price depends on the total time and agenda; the individual entry prices are not automatically added. CI/CD pipelines are part of the GitLab workshop.
Remote half-day · 3 hours · up to 6 people · from 990 € per team plus VAT. Other formats and in-house appointments after joint planning.
Suitable additions for your agenda
GitLab CI/CD & Deployment Training
Jobs, Stages and Runner · Tests, Artifacts and Variables
TYPO3 Developer Training
Sitepackage and project structure · Fluid templates and TypoScript
DDEV training for TYPO3 & PHP
DDEV project configuration · Database import and local commands
For reference: Pro Git: Branching and Merging. Official documentation complements the exercises and remains accessible after the appointment.
Frequent questions about services and prices
Do we need GitLab or GitHub?
The basics are independent of the hosting of the repository. For exchange and review we can use your agreed platform or a prepared exercise project. The training does not sell platform access.
Do we work with a command line or a graphical interface?
We explain the underlying git steps. We tailor the concrete exercises to the editor and tools of your team. Thus, terms and processes remain comprehensible even when changing the surface.
Is Git possible as a module of another training?
Yes. If, for example, branches or merge conflicts are the actual hurdle for TYPO3 development or deployment, we plan these exercises into the overall agenda. For basic uncertainties, a separate half-day is often more useful than a short insert.
What format and what price are planned?
A suitable starting point is a remote half-day: 3 hours, up to 6 people, from 990 € per team plus VAT. Included are coordination of learning goal and agenda, standard preparation, documents and task list. Extensive individual case analyses, larger groups and travel expenses are offered separately.
How do we ask for a team appointment?
Briefly describe the topic, previous knowledge and desired learning goal. The number of participants and the period can be supplemented directly. Matthias Gläßner clarifies the requirements with you and creates an offer. The request does not trigger a booking or payment.
Your lecturer: Matthias Gläßner
Senior web developer for TYPO3 and PHP · Founder and owner of Seitenreport · TYPO3 lecturer at GFU
18+ years of experience: Matthias Gläßner has been supporting companies, agencies, associations and public agencies in web projects since 2007. His focus is on TYPO3 development, PHP, interfaces and traceable development and deployment processes.
The training combines technical basics with examples, exercises and space for your questions. The topic, previous knowledge and goals of your team flow into the preparation.
Non-binding requests
Briefly mention your training topic. Matthias Gläßner will contact you personally.
Price limits: from 990 € per team plus VAT