Skip to content

Git series - Part 3: Branching & Joining Development Histories (1/2)

Photo of
Hosted By
Pablo E.
Git series - Part 3: Branching & Joining Development Histories (1/2)

Details

The Git series is a bi-weekly meetup organized by Coders Only, where techniques, methods and concepts around Git are brought to you in fun and thought provoking workshops. If you do not feel fully comfortable when using Git, want to improve your current workflows or wish to get fresh ideas for working with this powerful tool, then these workshops are made for you! You do not have to be an expert to join the workshop, but it is going to be helpful if you have used Git previously 😊

Let's go on with the series of Git sessions by diving into branching and merging development histories. We will take a closer look at branches, discuss merge conflicts and use `merge` to join development histories, using Gitception to show how Git handles everything in the repository repository. Having this knowledge will raise your confidence when confronting situations where Git does not behave the way you expect it πŸ•Ί

Agenda:
πŸ•‘ Check in: What do you expect from today's workshop?
πŸ•– Branches: Creating diverging development histories
πŸ•’ Conflicts in diverging development histories
πŸ•— Using `merge` to join development histories
πŸ•˜ Check out, 🍺🍻🍺 & πŸ•

Requirements:
The Git series are online. You will therefore need the obvious:
- a computer
- an internet connection
You will receive the link to the video session about half an hour before the meetup starts.

This session includes exercises and discussions on development concepts, I recommend setting up:
- a current Git version (>2.27 - 🚨 now the version is important 🚨)
- access to a Git bash
- a microphone (to participate in the discussions πŸ˜‰)

Since the session is long and pretty intensive, prepare some snacks to eat during the theoretical parts, so you don't starve in the exercises and discussions πŸ˜‹

Contact us on discord and ask all your questions about this workshop, the upcoming workshops, the speaker: https://discord.gg/GgHB256
Online event
This event has passed