"Merging" pull‐requests commits from master branch to maintenance branch

Use-case

• A PR with a change that does not break backward compatibility is contributed
• The original PR is targeting masterbranch, i.e. intended for next major relase
• After merge a maintainer must make sure that the commit also is included in active maintenance branches

Workflow

Make sure that you have an updated repo locally

Check out wanted maintenance branch

git checkout -b my_local_branch upstream/4.X

Do a git log on master branch and identify commits that shall be included in maintenance branch

user@debian3:~/vehicle_signal_specification$ git log upstream/master
commit 76fb8107d29842e1a5571ce9110eccab23c26994 (upstream/master)
Author: Erik Jaegervall <[email protected]>
Date:   Wed Sep 20 13:35:52 2023 +0200

    Fix instance documentation (#644)
    
    Fixes #641
    
    Signed-off-by: Erik Jaegervall <[email protected]>

commit 25beb5eebdb1e57c6e2da09af131f9632a9da111
Author: Erik Jaegervall <[email protected]>
Date:   Wed Sep 20 13:35:32 2023 +0200

    Makefile cleanup (#652)
    
    Removing some targets not used
    
    Signed-off-by: Erik Jaegervall <[email protected]>

commit 432f845620431f819dfae16b8626a673b979d831
Author: Sebastian Schildt <[email protected]>
Date:   Fri Sep 15 09:16:43 2023 +0200

    Change datatype for HVAC temeprature actuator to float to allow smaller than 1°C granualrity (#637)
    
    Signed-off-by: Sebastian Schildt <[email protected]>

Cherry-pick the wanted changes like this (no need to specify full UUID)

erik@debian3:~/vehicle_signal_specification$ git cherry-pick 76fb8107d 25beb5eebd 
[erik_4.X 8438e8a7] Fix instance documentation (#644)
 Author: Erik Jaegervall <[email protected]>
 Date: Wed Sep 20 13:35:52 2023 +0200
 7 files changed, 94 insertions(+), 42 deletions(-)
 create mode 100644 docs-gen/image_sources/.gitignore
 create mode 100644 docs-gen/image_sources/instance_tree.puml
 create mode 100644 docs-gen/image_sources/instance_tree_expand.puml
 create mode 100644 docs-gen/static/images/instance_tree.png
 create mode 100644 docs-gen/static/images/instance_tree_expand.png
 delete mode 100644 docs-gen/static/images/instances.png
[erik_4.X 168234f1] Makefile cleanup (#652)
 Author: Erik Jaegervall <[email protected]>
 Date: Wed Sep 20 13:35:32 2023 +0200
 2 files changed, 7 insertions(+), 23 deletions(-)

• Push the new branch to your remote repo
• Create a new PR towards the maintenance branch (e.g. 4.X)
• Do a sanity check of the diff
• Verify that build succeeds
• Do a rebase and merge (do not squash, no merge commit)