Differences

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

--- devel:backporting-to-3.2.x [2011/11/21 11:05]
miconda [Backporting to branch 3.2]
+++ devel:backporting-to-3.2.x [2011/11/21 11:08]
miconda [Remarks]
@@ Line 301: / Line 301: @@
 <fc #0000FF>IMPORTANT: Again, before pushing commits to sip-router.org GIT repository in the stable branch, 3.2, be sure you have tested them properly and they don't break the code.</fc>
+==== Recommendations ====
+Use cherry-pick whenever it is possible, especially when fixing issues. The commit to stable branch will have a reference to the commit in the master branch, making easier to track if any fix has been forgotten to be ported.
 ===== Remarks =====
-Note this is one way of doing the backporting, there are many other ways, consult GIT manual for alternatives.
+Note this is one way of doing the backporting, there are many other ways, consult GIT manual for alternatives. This is a wiki page -- people knowing alternatives to do porting of the patches from one branch to another are welcome to contribute.

Kamailio SIP Server Wiki