Doing experimental learning of git flow for my new project.. I noticed the following:
The following scenarios:
git flow hotfix start 1.1.2
git flow hotfix start 1.1.3 support/1.x
masterbranch is currently in
hotfixwas for an issue in a code section introduced in
v1.1but still relevant and used in the current development branch, how do I go about merging them together?
Since you won't merge an
hotfix branch (where the issue was solved) into master, you can cherry-pick the relevant commit back to
log view (Cmd-2), just select one or more commit lines (Cmd-click or Shift-click multi-selects), then right-click and select '