... | ... | @@ -39,10 +39,36 @@ Whenever you have finished a single working task, e.g. the creation of a new wid |
|
|
|
|
|
The quoted text after the **_-m_** parameter informs other MOM-CA developers about your changes. Try to formulate the commit messages as accurate as possible so that other MOM-CA developers get a good idea about what you have changed.
|
|
|
|
|
|
# Commit Your Changes to the Public Git Repository
|
|
|
**It is important to commit all changes in a well formatted way, i.e. to use 2 spaces (no tabs) for code indentaion! Otherwise, other MOM-CA developers have no chance to follow your changes conveniently with the github version difference tool. See the [MOM-CA Development Environment guide](./Development-Environment) for more information.**
|
|
|
|
|
|
After you have tested your local changes carefully, commit your changes into your fork on the public Git repository with the following command:
|
|
|
# Integrationg Your Changes into the Main Development
|
|
|
|
|
|
`git push origin master`
|
|
|
## Workflow: Forking
|
|
|
MOM-CA follows a ["integrator-manager" workflow](http://git-scm.com/book/en/v2/Distributed-Git-Distributed-Workflows#Integration-Manager-Workflow). That means that every developer stores his changes in his own repository (e.g. a github fork). Before pushing your changes you have to create a fork:
|
|
|
|
|
|
**It is important to commit all changes in a well formatted way, i.e. to use 2 spaces (no tabs) for code indentaion! Otherwise, other MOM-CA developers have no chance to follow your changes conveniently with the github version difference tool. See the [MOM-CA Development Environment guide](./Development-Environment) for more information.** |
|
|
\ No newline at end of file |
|
|
* Sign in into github.com
|
|
|
* Click on the "Fork" button on https://github.com/icaruseu/mom-ca
|
|
|
* Fork mom-ca into your personal repository
|
|
|
|
|
|
You can add an abbreviation to the new mom-ca remote repository in your local git repository with
|
|
|
|
|
|
`git remote add MyRepo https://github.com/{your git repository name}/mom-ca`
|
|
|
|
|
|
## Push Your Changes to Your Fork
|
|
|
|
|
|
After you have tested your local changes carefully, push your changes into your fork on the public Git repository with the following command:
|
|
|
|
|
|
`git push {MyRepo} master`
|
|
|
|
|
|
where `{MyRepo}` stands for the abbreviation of your mom-ca fork.
|
|
|
|
|
|
## Create Pull Request
|
|
|
|
|
|
When you feel like your changes should be deployed in the live system you
|
|
|
* go to your mom-ca fork
|
|
|
* select the pull request tab on the right and
|
|
|
* create a `new pull request` with some comments on what you have changed
|
|
|
|
|
|
## Deployment of the Pull Request
|
|
|
|
|
|
The integrator-manager (currently it's Daniel Jeller in Vienna supported by Georg Vogeler) will then check your changes, merge your changes into the main fork and deploy everything on the live server. If that takes a bit, you can send the integrator-manager-team personal messages to remind them - they are busy ... |
|
|
\ No newline at end of file |