-
Notifications
You must be signed in to change notification settings - Fork 59
Development workflow
Temco Controls edited this page May 7, 2018
·
22 revisions
Before learning on how we would proceed with development workflow, it is important to understand a few github terms. They are as follows:
-
Base repo:
temcocontrols/T3000_Building_Automation_System. The base repo is the main repository of code for the project. This contains all the latest code as well as all earlier versions since the beginning of time. -
Forked repos:
Each fork of the main repo corresponds to a team member’s work, it is a copy of the main repo created under the contributor's own github account. In the screen shots used in this wiki the repo is forked under a demo account called: https://github.com/TemcocontrolsArry -
Branch:
Each branch within the fork and also in the main repo there are several branches which correspond to various efforts in the project such as different channels of development, hotfixes or experimental work. -
Pull request:
A pull request is a request for work done in a particular fork or branch to be pulled into the main branch. Every time a task is completed we create a pull request corresponding to the commits made in that task. These commits are pulled from the fork-> branch to the main repo -> main branch usually.
Development workflow for working with T3000 Building Automation Project can be divided in to two parts:
- One-time activity
- Day-to-day activities
1.1 Forking base repo
1.2 Cloning the fork
1.3 TortoiseGit settings
2.1 Development and programming
2.2 Commit changes
2.3 Push changes to fork
2.4 Generate pull request
2.5 Review and Accept Pull request
2.6 Pull changes from base repo
Quick Links:
Working with T3000 Building Automation System
Wiki Home
Introduction to T3000 project