diff options
| author | Kali Kaneko <kali@leap.se> | 2013-07-02 22:29:32 +0900 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2013-07-02 22:29:32 +0900 |
| commit | 1d30e2580592ef905d9b21c475459da1e40b1cd6 (patch) | |
| tree | 6ec48c6b5234da55ecc91ad3c6235fb20b61315c /docs/dev/workflow.rst | |
| parent | 81dc8ebe9ef46c0fafa75cba5c4959bb822da686 (diff) | |
| parent | 5b975799ce9b7a6e0a88be4bcb48bdfb90800bb3 (diff) | |
Merge branch 'master' of ssh://leap.se/leap_client
Diffstat (limited to 'docs/dev/workflow.rst')
| -rw-r--r-- | docs/dev/workflow.rst | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/docs/dev/workflow.rst b/docs/dev/workflow.rst index 5ceccca4..e36431ff 100644 --- a/docs/dev/workflow.rst +++ b/docs/dev/workflow.rst @@ -20,20 +20,22 @@ If you introduce a new dependency, please add it under ``pkg/requirements`` or ` Git flow -------- -See `A successful git branching model <http://nvie.com/posts/a-successful-git-branching-model/>`_ for more information. The slight modification we make is that release tags are made in the release branch before getting merged to master, rather than getting tagged in master. +We are basing our workflow on what is described in `A successful git branching model <http://nvie.com/posts/a-successful-git-branching-model/>`_. .. image:: https://leap.se/code/attachments/13/git-branching-model.png The author of the aforementioned post has also a handy pdf version of it: `branching_model.pdf`_ +However, we use a setup in which each developer maintains her own feature branch in her private repo. After a code review, this feature branch is rebased onto the authoritative integration branch. Thus, the leapcode repo in leap.se (mirrored in github) only maintains the master and develop branches. + A couple of tools that help to follow this process are `git-flow`_ and `git-sweep`_. .. _`branching_model.pdf`: https://leap.se/code/attachments/14/Git-branching-model.pdf .. _`git-flow`: https://github.com/nvie/gitflow .. _`git-sweep`: http://pypi.python.org/pypi/git-sweep -Merge into integration branch ------------------------------ +Code review and merges into integration branch +----------------------------------------------- All code ready to be merged into the integration branch is expected to: * Have tests |