Commits

Thomas Waldmann  committed c9fce87

Edited online

  • Participants
  • Parent commits 887fa8f

Comments (0)

Files changed (1)

File HowToRelease.wiki

 
 = Branches in the repository =
 * 2.4x = release maintenance branch for 2.4.x (do simple bug fixes there). Do **not** merge default into maintenance branch.
-* default = development branch (do bigger stuff there). Now and then, merge maintenance branch into default (so default gets the bug fixes also).
+* default = development branch (do development there, but keep it usable). Now and then, merge maintenance branch into default (so default gets the bug fixes also).
+* xxxxx = branch for critical development (when doing big stuff, breaking things, unsafe outcome: create a separate branch, merge into default on good outcome)