Configuration #1502

Feature #418: === Configuration & Build ===

Feature #1686: == Release procedures and pre-release actions ==

Configuration #1150: Improve release script procedure

rebase all branches after release (change release script or instructions)

Added by wuttke over 3 years ago. Updated over 3 years ago.

Status:RejectedStart date:11 Jul 2016
Priority:NormalDue date:
Assignee:-% Done:

0%

Category:-
Target version:Sprint32

Description

'develop' and any living feature branch should at any time contain the common history at least up to the latest release; in particular, for clarity of the git history, they should contain the latest release tag.

Therefore, after adding a new version tag to 'master', 'develop' and the feature branches should be rebased, instead of merging 'release-<version>' into them.

Change release script or instructions accordingly.

History

#1 Updated by herck over 3 years ago

  • Status changed from Sprint to Rejected

We can't rewrite history of shared and active branches. This would entail a lot of problems for developers working on the develop branch (or branches that originate there).

Also available in: Atom PDF