Project

General

Profile

Actions

feature request #7110

open

taxeditor hotfix script gitflow-finish.sh must not merge back to develop by default

Added by Andreas Kohlbecker about 5 years ago. Updated about 2 years ago.

Status:
New
Priority:
New
Category:
devOps
Target version:
Start date:
Due date:
% Done:

0%

Estimated time:
Severity:
normal
Tags:
git

Description

when finishing a hotfix release the gitflow-finish.sh scripts always merges the changes back to develop. This not always wanted since the hotfix branch may contain code which workaround which never should incorporated into the develop branch. Furthermore can conflicts exist between the hotfix and the develop branch. A conflict will set the HFX-FINISH to to FAILED.

Due to these reasons the merge at the end of a hotfix finish must be optional, and .... "diesen aber konfigurierbar machen: "nobackmerge"
Fall man "nobackmerge" ausgewählt hat sollte der Job nach erfolgreichem Durchlauf am Ende eine Email alle Entwickler verschicken, die in zu dem Branch beigetragen haben. Diese Mail enthält eine Warnung über die nicht gemergten commits."

BTW, git flow hotfix finish has the same option: -b, --[no]nobackmerge


Related issues

Related to EDIT - bug #8105: better hotfix branch strategy in git flow to avoid commits in master which are missing in developIn ProgressAndreas Kohlbecker

Actions
Actions #2

Updated by Andreas Müller about 5 years ago

  • Target version changed from Reviewed Next Major Release to Unassigned CDM tickets
Actions #3

Updated by Andreas Kohlbecker almost 4 years ago

  • Related to bug #8105: better hotfix branch strategy in git flow to avoid commits in master which are missing in develop added
Actions #4

Updated by Andreas Kohlbecker about 2 years ago

  • Tags set to git
Actions

Also available in: Atom PDF