... | @@ -4,10 +4,10 @@ This section defines our git-workflow for developers. Contributors should use th |
... | @@ -4,10 +4,10 @@ This section defines our git-workflow for developers. Contributors should use th |
|
Merge Requests which aren't following our Merge-Contract (below) will be closed.
|
|
Merge Requests which aren't following our Merge-Contract (below) will be closed.
|
|
|
|
|
|
## The workflow
|
|
## The workflow
|
|
* Direct pushes to staging and master aren't allowed. There must be a new branch with a merge request for every change (bugfixes, typos, label-/text-changes, codestyles, refactoring, etc...)
|
|
* Direct pushes to staging and master aren't allowed. There must be a new branch with a merge request for every topic (fixup (for a issue),feature, label-/text-changes, codestyles, refactoring, etc...). Don't mix topics like feature-implementation and refactoring.
|
|
* On finishing coding, a Merge-Request to the staging-branch should be created. Merge Requests to Master will always be denied.
|
|
* On finishing coding, a Merge-Request to the staging-branch should be created. Merge Requests to Master will always be denied.
|
|
* A Master will review and test the MR. Better you test before (at least a smoke test, it's recommended to do some additional testing).
|
|
* A Master will review and test the MR. Better you test before (at least a smoke test, it's recommended to do some additional testing).
|
|
* Keep your MR up-to-date: There might be some other MR's which are handled before yours. You should rebase your branch just-in-time, MR's with merge conflicts will be closed, if they last longer than some hours.
|
|
* Keep your MR up-to-date: There might be some other MR's which are handled before yours. You should rebase your branch just-in-time, MR's with merge conflicts will be closed, if they last longer than some days.
|
|
|
|
|
|
## Contract for Merge Requests
|
|
## Contract for Merge Requests
|
|
* Appreciate the code-styles (jshint and jscs). They are checked by two build-processes, MR's with failing builds will be closed.
|
|
* Appreciate the code-styles (jshint and jscs). They are checked by two build-processes, MR's with failing builds will be closed.
|
... | | ... | |