developing_in_branches
Differences
This shows you the differences between two versions of the page.
| Both sides previous revision Previous revision | Next revision Both sides next revision | ||
|
developing_in_branches [2012/03/19 08:36] aseques |
developing_in_branches [2013/01/04 16:54] aseques updated instructions for new contributors |
||
|---|---|---|---|
| Line 1: | Line 1: | ||
| === Workflow === | === Workflow === | ||
| - | i-mscp development is happening on github, the use of git allow the developers to use their own branches for new features, making easier to keep in sync with current development. | + | i-mscp development is happening on github, the use of git allows the developers to use their own branches for new features, making easier to keep in sync with current development. |
| This is a small guide to help you getting started with git development in i-mscp | This is a small guide to help you getting started with git development in i-mscp | ||
| Line 9: | Line 9: | ||
| The project url is [[https://github.com/i-MSCP/imscp|this one]], by forking, you only create clone of the project on wich you have commit rights. | The project url is [[https://github.com/i-MSCP/imscp|this one]], by forking, you only create clone of the project on wich you have commit rights. | ||
| - | * Clone the original github reposotory | + | * Clone that code to your system |
| - | You can follow the instructions [[http://trac.i-mscp.net/wiki/releases_git|here]] | + | |
| - | * Change the cloned repositort to use your fork | + | git clone git://github.com/your_username/imscp.git |
| - | + | ||
| - | git remote set-url origin https://your_name@github.com/your_name/imscp.git | + | |
| * Create a branch for your great feature | * Create a branch for your great feature | ||
| git branch great_feature | git branch great_feature | ||
| - | |||
| * Add the modified files that you want to be commited | * Add the modified files that you want to be commited | ||
| Line 38: | Line 34: | ||
| Sometimes is takes a while to merge your changes with upstream, a good way to sync your branch with the upstream is to add a second remote url (the upstream repositorie) and periodically fetch the changes from there: | Sometimes is takes a while to merge your changes with upstream, a good way to sync your branch with the upstream is to add a second remote url (the upstream repositorie) and periodically fetch the changes from there: | ||
| - | * Adding the upstream repostory | + | * Add the upstream (official) code into your server (needed to rebase) |
| git remote add upstream https://github.com/i-MSCP/imscp.git | git remote add upstream https://github.com/i-MSCP/imscp.git | ||
| Line 46: | Line 42: | ||
| git fetch upstream | git fetch upstream | ||
| - | * Merge the upstrem code with yours, no more steps if there aren't code conflicts. | + | * Merge the upstream code with yours, no more steps if there aren't code conflicts. |
| git merge upstream/master | git merge upstream/master | ||
/var/www/virtual/i-mscp.net/wiki/htdocs/data/pages/developing_in_branches.txt · Last modified: 2013/03/21 10:02 by nuxwin
