Infrastructure/Git/Simple Workflow

From KDE Community Wiki
Revision as of 11:47, 5 June 2011 by Odysseus (talk | contribs) (Created page with '== Simple KDE Git Workflow == This Git Workflow is designed to be followed by a new Git user who needs a simple workflow for bug fixes and new features in a manner similar to th...')
(diff) ← Older revision | Latest revision (diff) | Newer revision → (diff)

Simple KDE Git Workflow

This Git Workflow is designed to be followed by a new Git user who needs a simple workflow for bug fixes and new features in a manner similar to the old SVN workflow.

Note that each module may choose to adopt a more complex workflow and you should check with your modules maintainers if this is the case.

The worked examples given will be for an imaginary app called KFoo in a git.kde.org repository called 'kfoo'.

Set-up

This section documents how to set you Git and you repository for development.

Configure Git

Follow the KDE Git Configuration.

Clone your repository

You need to clone your repository

Basic Actions

This section documents basic actions that are performed within your workflow.

See also the KDE Git Recipes page.

Create a Work Branch

Commit Your Changes

Push Your Changes

Local Bug Fixing

This example workflow is for locally fixing bugs in stable and unstable branches and pushing them to the central repository.

This workflow is only recommended for small fixes or where you are the only developer on a project.

Local Feature Development

This example workflow is for locally working on new features in unstable branch and pushing them to the central repository.

This workflow is only recommended for small features or where you are the only developer on a project.

Remote Feature Development

This example workflow is for working on new features in a feature branch hosted on the central repository.

This workflow is recommended for larger features or where there are many developers on a project.