eXoer on the grill: New Git Rebase Workflow

Presentation of the new

GIT REBASEworkflow in eXo

Why in eXo we stop using GIT MERGE and start using GIT REBASE to integrate change

from one branch to another

A presentation

Agenda

Enjoy...

1. Git Merge Process2. Git Rebase Introduction3. Rebase - the new eXo Workflow4. Transition/Migration from Merge to Rebase

In eXo we used the

GIT MERGEmethod until today

Process used today

● Using GIT-Merge for integrating changes between branches

● Many feature branches are in progress in parallels

● Merge/Sync feature branches with master frequently, every week(s) regularly

Consequences

Wonderful ???

Amazing graph of commits history

Consequences

Drawbacks

● Commit history is unusable for commit tracker

● Be off the track of Feature Branch development

● Potentially have to reset useless changes

● Don’t have a clear context when resolving conflicts -> easy to make mistakes.

An introduction to the powerful

GIT REBASEmethod to integrate change

Introduction

● Another way (beside Merge) to integrate changes from one branch to another

● Take all the changes (commits) that were committed on one branch and replay them on another one, one by one in turn.

Introduction

● Powerful tool to clean-up/re-organize commit history

● A fast-forward merge to the branch you are rebasing onto.

How it works basicallyLet’s say we have:C1---C2---C6---C7 (master)

C3---C4---C5 (feature branch)

After rebase:C1---C2---C6---C7 (master)

C3’---C4’---C5’ (feature branch)

How smart

Let’s say C4 and C6 are exactly the same patch, like below:C1---C2---C6---C7 (master)

C3---C4---C5 (stabilization)

After rebase:C1---C2---C6---C7 (master)

C3’---C5’ (stabilization)

Instantiate the new

WORKFLOWusing Git Rebase

Common rules

● Never push --force in master

● Push --force is only allowed in FBs

● Be careful before pushing with --force

Feature branch

Create a feature branch (FB) from masterC1---C2 (master)

C3 (FB)

with C3 is the POMs version update commit

Feature branchAfter a long while, the history looks like:C1---C2---C6---C7 (master)

C3---C4---C5 (feature branch)

Integrate changes from master with rebase:C1---C2---C6---C7 (master)

Feature branchMerge to master with non-fast-forward :C1---C2---C6---C7-----------------C8 (master)

Merge to master with fast-forward :C1---C2---C6---C7---C4’---C5’ (master)

C4’---C5’ (feature branch)

Good Practices

● Squash related commits before merging

● Plan to sync with master as frequently as possible (jenkin jobs ?)

It’s time to

MIGRATEfrom merge to rebase

Transition - Migration

● Start using rebase for new feature branch

● If possible, convert to use rebase on existing feature branches

● Use rebase for auto-merge Jenkins jobs, such as translation injection, etc. ???

● PORTAL team can be in charge of the migration

You are interesting to

LEARN MOREabout our Git Workflow in eXo ?

http://developer.exoplatform.org/docs/scm/git/workflow/

eXoer on the grill: New Git Rebase Workflow

Technology

NEW Teal fee schedule - Microsoft · PDF fileD5710 Rebase complete maxillary (upper) denture $315 D5711 Rebase complete mandibular (lower) denture $315 ... Teal Fee Schedule General

Git Rebase vs Merge

Advanced GIT - Varwig · Fast-Forward/Git Reset Git always tries to preserve history Fast Forward = Reset instead of Merge Because this reset does not lose history ... Rebase git

Smokin' git rebase - David Golden · Smokin' git rebase David Golden Staff Engineer, MongoDB DCBPW • April 2016

2012 GIT Sinhala @ apepanthiya GIT Sinhala @ apepanthiya.lk.pdfTitle: 2012 GIT Sinhala @ apepanthiya.lk Subject: G.C.E A/L GIT Past Papers Keywords: git, al git, git papers, git past

To Rebase or Not to Rebase: Taming Your Git History

CEED Software Thrust - Jed Brown2017/01/11 · Can rebase or merge to existing branch if it makes sense Commit often, then organize with git rebase -i See also rebase.autosquashand

Smokin' git rebase - xdg.me€¦ · Smokin' git rebase David Golden Staff Engineer, MongoDB NY Perl Meetup • Feb 2016. master failing test A topic1 test A passing. master failing

Git, The Developers Perspecitve - CALUGMay 11, 2016 · • Git rebase – Instead of merging data end points, apply all changes in order to a branch and clean up branches and commits

Don't fear the rebase

Rebase versus merge

REBASE, RELINES, REPAIRS - Cliniccandidate for a rebase, reline, or repair. In the case of repairs, the Brockville Denture Clinic can often offer same-day service. REBASE, RELINES,

Rebase Para Dentaduras Parciales y Totales

Git: Best Practices · git rebase --interactive $ git rebase -i HEAD~5 pick d3a7c85 New changes pick b538761 Other changes pick 61be62b Some nice new changes pick e897f7f Update for

Products.TinyMCE Documentation$ git rebase --ignore-whitespace --onto 3.4.7-plone 3.4.3 3.4.7 Ignore whitespace makes sure different lineendings are not an issue while merging. PS:

Dipal reline n rebase

2012 GIT Sinhala @ apepanthiya GIT Sinhala @ apepanthiya.lk.pdf2012 GIT Sinhala @ apepanthiya.lk Subject: G.C.E A/L GIT Past Papers Keywords: git, al git, git papers, git past papers,

2012 GIT English - Ape Panthiya GIT English... · 2012 GIT English @ apepanthiya.lk Subject: G.C.E A/L GIT Past Papers Keywords: git, al git, git papers, git past papers, git exam,

Build software better, together - Delphi Daygit checkout feature1 git rebase master 13) Rebase (no conflict) Fast forward merge alla fine e0e5ae3 TNewCliente = class… property Age:

CS140 Project 1: Threads - Stanford University · git basics git add git commit git pull git push git merge git branch * Lots of git tutorials and help available online