Differences

This shows you the differences between two versions of the page.

Link to this comparison view

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-guidelines|Git Commit Guidelines]] and the [[git:commit-into-master|Git Push into master HOWTO]]. If this is the first time you contribute code to the project then please read also [[:coding_style|Coding Style]].
  
 <code> <code>
-git commit .+git add files_that_you changes # use git status or git diff to see them 
 +git commit
 </code> </code>
  
Line 69: Line 71:
 git push origin master:master git push origin master:master
 </code> </code>
 +
 +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:
 +
 +<code>
 +git fetch origin
 +git rebase origin/master
 +git push origin master:master  # if it fails repeast from git fetch
 +</code>
 +
 +
  
 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:
 <code> <code>
 cd /../kamailio-3.0 cd /../kamailio-3.0
-git pull origin+git checkout kamailio-3.0 
 +git pull --rebase origin kamailio-3.0
 </code> </code>
  
Line 80: Line 93:
  
 <code> <code>
-git cherry-pick -x __commit_to_master_hash_id__+git cherry-pick -x [commit_to_master_hash_id] 
 +</code> 
 + 
 +For example: 
 + 
 +<code> 
 +git cherry-pick -x 7b8b6f647365655afa210f5e95baef06398ef612 
 +</code> 
 + 
 +A quick way to check for the master hash id is: 
 + 
 +<code> 
 +git fetch origin # if you are using a different directory for kamilio-3.0 
 +git log --oneline origin/master
 </code> </code>
  
Line 89: Line 115:
 </code> </code>
  
 +If push fails, rebase and try again:
 +
 +<code>
 +git fetch origin
 +git checkout kamailio_3.0
 +git rebase origin/kamailio_3.0
 +git push origin kamailio_3.0:kamailio_3.0
 +</code>

Navigation

Wiki

Other

QR Code
QR Code git:kamailio-repository (generated for current page)