|
|
@@ -34,8 +34,7 @@ release.
|
|
|
|
|
|
When doing a /major release/, make sure all changes from the maint
|
|
|
branch are merged into the the master branch, then merge the master
|
|
|
-branch back into maint to synchronize the two. Further, make sure to
|
|
|
-update the Version and Package-Requires headers in org.el.
|
|
|
+branch back into maint to synchronize the two.
|
|
|
|
|
|
** Minor release
|
|
|
|
|
|
@@ -43,9 +42,7 @@ The release number for minor releases look like this: =7.13.1=
|
|
|
|
|
|
Minor releases are small amends to main releases. Usually they fix
|
|
|
critical bugs discovered in a main release. Minor bugs are usually
|
|
|
-not fixed -- they will be addressed in the next main release. Make
|
|
|
-sure to update the Version header in org.el when making a new minor
|
|
|
-release.
|
|
|
+not fixed -- they will be adressed in the next main release.
|
|
|
|
|
|
Only the fix to the bug is bundled into a release, without the main
|
|
|
development work going on in the master branch. Since the bug fix
|
Rasmus