Skip to content
GitTree
العربية
Branches and tags

Use Gitflow actions

Gitflow is a branching model with a production branch, a development branch, and feature, release and hotfix branches. GitTree’s Gitflow section initialises it and starts and finishes those branches, merging, tagging and deleting them for you.

FreeUpdated

Works in GitTree Free: every local Git feature, once you are signed in.

On this page
  1. Before you start
  2. Where to find it
  3. Steps
  4. Expected result
  5. What Finish does
  6. If something goes wrong
  7. Questions
  8. Related

Before you start

  • A repository whose team follows Gitflow, or that you want to set up for it.

Where to find it

  • The Gitflow section of the left panel: Initialise Gitflow…, then Features, Releases and Hotfixes.
  • The command palette: Gitflow: Start Feature…, Gitflow: Start Release…, Gitflow: Start Hotfix….
ActionmacOSWindows and Linux
Undo a Gitflow step⌘ZCtrl+Z

Steps

  1. Initialise Gitflow

    Choose Initialise Gitflow…. Check the Production branch, Development branch and the prefixes, such as feature/, and press Initialise. It writes these settings to the repository’s Git configuration and creates the development branch if needed.

  2. Start a branch

    Choose Start… under Features, Releases or Hotfixes, type the Feature name or version, and press Start. GitTree creates the branch from the right base and checks it out.

  3. Finish it

    When the work is done, choose Finish… on the branch. GitTree says exactly what will happen and does it.

Expected result

The branch is merged where Gitflow says it belongs, tagged for a release or hotfix, and deleted.

What Finish does

Finishing each kind of Gitflow branch
BranchFinish
FeatureMerges it into the development branch and deletes it.
ReleaseMerges it into the production branch, tags that with the version, merges it into the development branch and deletes it.
HotfixThe same as a release: production, tag, development, delete.

If something goes wrong

“Gitflow is already initialised here.”

The repository already has Gitflow settings. Use the Features, Releases and Hotfixes entries directly.

Questions

Do I need Gitflow?

No. Many teams use one main branch with short feature branches and pull requests. Gitflow suits projects with scheduled releases.

Related