I have a situation where code developed in a branch off master (FEATURE) needs to be merged into an older branch RELEASE (and then released as part of a release from that older branch).
git merge FEATURE
Create a new branch
feature_to_be_merged based on
feature. Rebase it on commit 3 and merge it onto
Beware that the rebase operation might lead to conflicts.