This shows you the differences between two versions of the page.
Both sides previous revision Previous revision Next revision | Previous revision | ||
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:11] miconda [Recommendations] |
||
---|---|---|---|
Line 301: | Line 301: | ||
<fc # | <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. | ||
+ | |||
+ | For quick reference, when you are in local branch 3.2 and want to backport commit with id a1b2c3d, here is the sequence of commands: | ||
+ | |||
+ | < | ||
+ | cd ~/ | ||
+ | git pull origin | ||
+ | git cherry-pick -x a1b2c3d | ||
+ | git push origin 3.2:3.2 | ||
+ | </ | ||
===== Remarks ===== | ===== Remarks ===== | ||
- | Note this is one way of doing the backporting, | + | Note this is one way of doing the backporting, |