Long term support using git-flow to merge a hotfix to develop branched off the support branch
Doing experimental learning of git flow for my new project.. I noticed the following:
The following scenarios:
Normally git-flow workings:
git flow hotfix start 1.1.2Will create a branch based on master and when done merges with master and develop.
Branching based on another branch
git flow hotfix start 1.1.3 support/1.xBut then the hotfix created based on support branch will merge back into that support branch and not back into develop nor master but will be tagged when finished.
Problem
If my master branch is currently in v3.2.0 but the hotfix was for an issue in a code section introduced in v1.1 but still relevant and used in the current development branch, how do I go about merging them together?
The reason for this question is that some clients would need long term support of a specific older version even if your newer version is more superior.
Possibly solution but not( using SourceTree)
Atlassian SourceTree always only merge finish hotfix with master and develop but never with the support branch that is needed by clients (tested thrice)
If my
masterbranch is currently inv3.2.0but thehotfixwas for an issue in a code section introduced inv1.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 master.
log view (Cmd-2), just select one or more commit lines (Cmd-click or Shift-click multi-selects), then right-click and select '
Cherry pick'.
- Should I merge master into a feature branch to bring it up to date? Would this be considered bad practice?
- Switch node_modules folder when I change git branch
- git p4 submit fails
- Assign the latest release in GitHub (not using git)
- How to sign out github account in vs code
- Visual Studio Team Explorer - GIT: Automatically ignoring new files
- Get modified files in Github actions
- Command to open file with git
- git - gpg onto mac osx: error: gpg failed to sign the data
- Git credential helper - update password
- How to remove cached credentials from Git?
- If I fork someone else's private Github repo into my account, is it going to appear in my account as a public repo?
- Using local git username and email on remote machine
- How do I delete all Git branches which have been merged?
- Switch to another Git tag
- Merging changes from master into my branch
- Refname 'master' is ambiguous
- git fetch origin --prune doesn't delete local branches?
- Git: warning: refname 'master' is ambiguous
- git: don't sort 'for-each-ref' output
- GitKraken won't open
- git shows files changed with 0 insertions(+), 0 deletions(-)
- How do I access my SSH public key?
- Can't push to GitHub because of large file which I already deleted
- Overwrite the master branch with a orphan branch in git
- Why did Git throw "Failed to load library 'libcurl-4.dll'" while cloning?
- In merge request gitlab ci shows error that previous job needs another job but is not in any previous stage but it is
- Git get history of branches that i was in
- How do you remove an invalid remote branch reference from Git?
- Git archive including the actual repository?