13-15 March 2020

City, University London

Ease and Manage your code with Git Rebase

Prerequisites
  • Git basic knowledge

 

Session details

In Git, the rebase command integrates changes from one branch into another. It is an alternative to the better known "merge" command. Most visibly, rebase differs from merge by rewriting the commit history in order to produce a straight, linear succession of commits.

I will explain below points:

1. What is Git Rebase and why to prefer it.

2. Why we should prefer Git Rebase utilities that specializes in integrating changes from one branch onto another.

3. How Git Rebase helps to solve conflicts in your code

4. How to Squash and merge your commits using Git Rebase

5. How Git Rebase improves to maintain clear history

Skill Level
Session Track

Sponsors

Diamond

ddev

Gold

Acquia - Experience digital freedom
Agiledrop - Trusted Drupal teammates
Droptica
Dropsolid

Weekend Keynote Speakers

Kevin Bridges

DDEV, CTO

Michel van Velde

One Shoe, CEO

Nick Veenhof

Dropsolid, CTO

CxO Keynote Speakers

Kevin Bridges

DDEV, CTO

Michel van Velde

One Shoe, CEO

Greg Harvey

Code Enigma, Director

Rachel Lawson

Drupal Association, Community Liaison

Carrie Lacina

Drupal Association, Fund Development Director

Jeffrey A. “jam” McGuire

Open Strategy Partners, Partner

Tracy Evans

Open Strategy Partners, Partner

Join the Drupal Association

The Drupal Association unites a global open source community to build and promote Drupal.

The Association is a not-for-profit organization that relies on individuals and businesses to fund everything they do for Drupal — from drupal.org to DrupalCon and community programs.

Connect with us and support our mission-driven work.

Support the Drupal Association

Hosting provided by

platform.sh