errzey/gflow.md

Last active December 21, 2015 01:27

Star (0) You must be signed in to star a gist
Fork (0) You must be signed in to fork a gist

Select an option

Learn more about clone URLs
Clone this repository at <script src="https://gist.github.com/errzey/0a5e0bfa399a57207c29.js"></script>
Save errzey/0a5e0bfa399a57207c29 to your computer and use it in GitHub Desktop.

Download ZIP

Raw

Using git-flow to make your development process awesome

The Workflow in Detail

Commandline Utility For the flow Model

=========================================

Fork the project into your own account

Simply go to the repository of choice and click fork, then setup your origin and upstream for tracking.

git clone git@github.com:<username>/<project>.git
cd <project>
git remote add upstream git@github.com:<MainRepo>/<project>.git
Right now, none of our upstream repositories have a develop branch. Once we do: git checkout -t upstream/develop. This will inform you of changes made to the upstream (main).
git fetch --all --tags

Install git-flow

git clone http://github.com/nvie/gitflow.git
cd gitflow/
git submodule init
git submodule update
sudo make install

Update your tree to be git flow compliant

git checkout develop
git flow init
- This brings up a menu of various things you can configure. Using defaults is usually fine.

Doing stuff

Some basics

Features

git flow feature start <feature name>
This will create a branch feature/<feature name> based from develop and switch to it.
Do your feature modifications on this branch. PUSH OFTEN
Once you feel as if you're code is complete, run git flow finish <feature name>
- This will automatically merge your changes back into develop, resolve conflicts if needed, and remove the feature branch locally.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment