Differences
This shows you the differences between two versions of the page.
| Both sides previous revision Previous revision Next revision | Previous revision | ||
|
git:kamailio-repository [2010/03/30 20:51] miconda |
git:kamailio-repository [2010/03/31 18:38] (current) miconda |
||
|---|---|---|---|
| Line 58: | Line 58: | ||
| Fetch the development (master) branch with your developer account. | Fetch the development (master) branch with your developer account. | ||
| - | Update the code, then do local commit: | + | Update the code, then do the local commit. Note that small commits are preferred (more smaller commits are better then a huge commit touching multiple modules or |
| + | adding multiple features or fixes). Please make sure you read first the [[devel: | ||
| < | < | ||
| - | git commit | + | git add files_that_you changes # use git status or git diff to see them |
| + | git commit | ||
| </ | </ | ||
| Line 69: | Line 71: | ||
| git push origin master: | git push origin master: | ||
| </ | </ | ||
| + | |||
| + | If git push fails it usually means someone updated master in the meantime and you should rebase on the latest version and retry the push: | ||
| + | |||
| + | < | ||
| + | git fetch origin | ||
| + | git rebase origin/ | ||
| + | git push origin master: | ||
| + | </ | ||
| + | |||
| + | |||
| Fetch in your kamailio 3.0 branch, in case you have two directories (otherwise, you can just check out the kamailio_3.0 branch): | Fetch in your kamailio 3.0 branch, in case you have two directories (otherwise, you can just check out the kamailio_3.0 branch): | ||
| Line 74: | Line 86: | ||
| < | < | ||
| cd / | cd / | ||
| - | git pull origin | + | git checkout kamailio-3.0 |
| + | git pull --rebase | ||
| </ | </ | ||
| Line 80: | Line 93: | ||
| < | < | ||
| - | git cherry-pick -x __commit_to_master_hash_id__ | + | git cherry-pick -x [commit_to_master_hash_id] |
| + | </ | ||
| + | |||
| + | For example: | ||
| + | |||
| + | < | ||
| + | git cherry-pick -x 7b8b6f647365655afa210f5e95baef06398ef612 | ||
| + | </ | ||
| + | |||
| + | A quick way to check for the master hash id is: | ||
| + | |||
| + | < | ||
| + | git fetch origin # if you are using a different directory for kamilio-3.0 | ||
| + | git log --oneline origin/ | ||
| </ | </ | ||
| Line 89: | Line 115: | ||
| </ | </ | ||
| + | If push fails, rebase and try again: | ||
| + | |||
| + | < | ||
| + | git fetch origin | ||
| + | git checkout kamailio_3.0 | ||
| + | git rebase origin/ | ||
| + | git push origin kamailio_3.0: | ||
| + | </ | ||
