Skip to content

Dev: Workflow

markusTraber edited this page Jun 18, 2020 · 6 revisions

Introduction

For task and issue tracking, the GitHub issue tracking is being used. Feel free to add descriptions of bugs, features and more, there is no obligation, that you have to take care of that afterwards.

In addition you are free to use the Kanban Board "IVA Software Development" in the Projects tab. Please make sure you are using the "Add cards" button for adding cards, based on issues.

The basic workflow is the following:

Issue -> Branch -> Coding -> Pull Request -> Master

Commiting directly to the "master" is prohibited.

Issue

Each feature, bugfix etc has its own issue on Github. If the issue does not exist, create one. Assign yourself as "Assignee" (on the issue in the right sidebar).

Branch

By assigning yourself as Assignee, a new branch will be created, based on the name of the issue. Pull this branch to your local repository and checkout this branch.

Coding

Well, do what you have to do on the branch. You have to commit and push at least once, when you finished your coding work.

Pull Request

Create a pull request on Github from your branch to the "master". Wait for Github to successfully build the project. As long, as the build is in process or it fails, you will not be able to merge your branch into the master. If it fails, you will have to fix it locally and commit and push the changes. A new build process will start again.

Master

When your branch has been merged into the master, the merged (now redundant) branch will be deleted automatically.

Done!