|
|
| (7 intermediate revisions by 4 users not shown) |
| Line 1: |
Line 1: |
| =Merge process in Qt=
| | #REDIRECT [[Merge Guidelines]] |
| | |
| During the development cycle merges are done from the release to stable and stable to dev branches.<br /> See for example [[Branch-Guidelines|http://wiki.qt.io/Branch-Guidelines]] .
| |
| | |
| The merge in the other direction happens in coordination with the release team.
| |
| | |
| =Merge instructions=
| |
| | |
| There are several ways to go about the merges, for individual merges of one repository use the normal git merge command.<br /> Note that you need special permissions to push merges and gerrit will refuse your push otherwise.
| |
| | |
| Since it’s not feasible to do so many commands manually for each repository, there is a script in qtrepotools/bin.<br /> Make sure to have python and qtrepotools/bin in your path.<br /> Shows the status. Pass it -d to do the merges. -f is the source branch and -t is the branch that the merge ends up in.
| |
| | |
| ===Categories:===
| |
| | |
| * [[:Category:Developing Qt|Developing_Qt]]
| |
| ** [[:Category:Developing Qt::Guidelines|Guidelines]]
| |