Translations:KPhotoAlbum/48/en: Difference between revisions
(Importing a new version from external source) |
(Importing a new version from external source) |
||
| Line 1: | Line 1: | ||
* ''master'' | * ''master'' <br />Current development branch | ||
* ''4.7''<br />Old stable (Qt4/Plasma4) branch. Only gets fixes for serious bugs on a case-by-case basis. | * ''4.7''<br />Old stable (Qt4/Plasma4) branch. Only gets fixes for serious bugs on a case-by-case basis. | ||
* ''5.x''<br />Branch tracked by [https://community.kde.org/Neon/Builder#The_Packaging Neon/stable].<br />When ''master'' is in stable condition, it should be synced to ''5.x'': {{Input|1=<nowiki>git checkout 5.x ; git merge master</nowiki>}} | * ''5.x''<br />Branch tracked by [https://community.kde.org/Neon/Builder#The_Packaging Neon/stable].<br />When ''master'' is in stable condition, it should be synced to ''5.x'': {{Input|1=<nowiki>git checkout 5.x ; git merge master</nowiki>}} | ||
* Feature branches are used in a very ad-hoc manner. If you are not a developer, don't bother with them.<br />If you are a developer, try using descriptive names that are not likely to interfere with future branches. | * Feature branches are used in a very ad-hoc manner. If you are not a developer, don't bother with them.<br />If you are a developer, try using descriptive names that are not likely to interfere with future branches. | ||
Latest revision as of 20:40, 12 December 2018
- master
Current development branch - 4.7
Old stable (Qt4/Plasma4) branch. Only gets fixes for serious bugs on a case-by-case basis. - 5.x
Branch tracked by Neon/stable.
When master is in stable condition, it should be synced to 5.x:git checkout 5.x ; git merge master
- Feature branches are used in a very ad-hoc manner. If you are not a developer, don't bother with them.
If you are a developer, try using descriptive names that are not likely to interfere with future branches.