How to keep the development branch clean?

Use case: The work is finished on the feature branch and needs to be checked into the development branch.

Default: Git performs a fast-forward merge by default. 

Result: A fast forward clutters the development branch and loses the overview on the work done in the feature branch.

Advise: The –no-ff flag causes the merge to always create a new commit object, even if the merge could be performed with a fast-forward. This groups all historical commits that belong to a feature branch and keeps the development branch clean.

More info at:

Spread the love

Geef een reactie

Specify Facebook App ID and Secret in Super Socializer > Social Login section in admin panel for Facebook Login to work

Specify GooglePlus Client ID and Secret in Super Socializer > Social Login section in admin panel for GooglePlus Login to work

Je e-mailadres zal niet getoond worden. Verplichte velden zijn gemarkeerd met *