pavelracu / gitflow Goto Github PK

0.0 1.0 0.0 240 KB

Shell 100.00%

gitflow's Introduction

Gitflow workshop

This repository is intended to introduce developers to gitflow. It will use the actual explanation of gitflow.

By the end of this workshop the end result should be the original explanation of gitflow without any errors/misspellings.

Intro

Vincent Driessen’s "git flow" branching model is a git branching and release management workflow that helps developers keep track of features, hotfixes and releases in bigger software projects. This workflow has lot of commands to type and remember, so there’s also the git-flow library of git subcommands to help automate some parts of the flow to make working with it easier.

Resources

Original Article

https://nvie.com/posts/a-successful-git-branching-model/

gitflow's People

Contributors

Watchers

gitflow's Issues

Add info about the two main branches used in development environment

Add the following text to the line 15:

At the core, the develpment model is greatly inspired by existing models out there. The central repo holds two main branches with an infinite lifetime:

master
develop

Solve typo introduced by #2 feature

The feature #2 introduced a bug in the code.
In order to solve the bug you should correct the word brunches and change it to branches.

Solve typo introduced by #8 feature

The feature #8 introduced a bug in the code.
In order to solve the bug you should correct the word mustard and change it to master.

Add information about the purpose of feature branches

Add the text bellow to the line 49:

Feature branches (or sometimes called topic branches) are used to develop new features for the upcoming or a distant future release. When starting development of a feature, the target release in which this feature will be incorporated may well be unknown at that point. The essence of a feature branch is that it exists as long as the feature is in development, but will eventually be merged back into develop (to definitely add the new feature to the upcoming release) or discarded (in case of a disappointing experiment).

Solve typo introduces by #6 feature

The feature #6 introduced a bug in the code.
In order to solve the bug you should correct the word brunches and change it to branches.

Add information about hotfix branches

Add the following text to the line 153:

Hotfix branches are very much like release branches in that they are also meant to prepare for a new production release, albeit unplanned. They arise from the necessity to act immediately upon an undesired state of a live production version. When a critical bug in a production version must be resolved immediately, a hotfix branch may be branched off from the corresponding tag on the mustard branch that marks the production version.

Hotfix - Add the summary to the end of the `gitflow.md` file

Summary

While there is nothing really shocking new to this branching model, the “big picture” figure that this post began with has turned out to be tremendously useful in our projects. It forms an elegant mental model that is easy to comprehend and allows team members to develop a shared understanding of the branching and releasing processes.

Add information about the release branches

Add the following text to line: 91

Release brunches support preparation of a new production release. They allow for last-minute dotting of i’s and crossing t’s. Furthermore, they allow for minor bug fixes and preparing meta-data for a release (version number, build dates, etc.). By doing all of this work on a release branch, the develop branch is cleared to receive features for the next big release.

Add info about the types of branches we might use in a dev environment.

Add the following text to the line 32:

The different types of brunches we may use are:

Feature branches
Release branches
Hotfix branches

Solve typo introduced by #1 feature

The feature #1 introduced a bug in the code.
In order to solve the bug you should correct the word develpment and change it to development.