Revision: c7fe75f27f61
Author: jean.deruelle <[email protected]>
Date: Tue Jul 17 13:16:37 2012
Log: Edited wiki page Contribute through web user interface.
http://code.google.com/p/sipservlets/source/detail?r=c7fe75f27f61&repo=wiki
Modified:
/Contribute.wiki
=======================================
--- /Contribute.wiki Tue Jul 17 13:05:31 2012
+++ /Contribute.wiki Tue Jul 17 13:16:37 2012
@@ -158,6 +158,13 @@
The code will be reviewed on the contributor's clone - if any further
changes are suggested, a couple of iterations might be needed so the
contributor will need to modify the code again, commit, push and comment on
the issue.
-Once the change is approved, a committer of Mobicents SIP Servlets will
merge it back into the main repository.
+Once the change is approved, a committer of Mobicents SIP Servlets will
merge it back into the main repository with the following commands.
+
+{{{
+git checkout -b feature-branch
+git pull https://code.google.com/r/jeanderuelle-test-fork/ feature-branch
+git checkout master
+git merge feature-branch
+}}}
Even though this may sound complicated, this process makes code reviews
easier and allows a lot of people to work on changes in parallel.