apertis-pkg-merge-local: Add new tool

Add a tool to help when a package update cannot be done by CI. This tool should help developers to perform the merge in a similar way as the CI and also help to run some basic checks.

Signed-off-by: Walter Lozano walter.lozano@collabora.com

requested review from @daissi

assigned to @wlozano

Add a tool to help when a package update cannot be done by CI

Can you clarify the context in which this tool is useful? Is it when there are merge conflicts in CI? or when a pipeline fails or anything else?

added 1 commit

• 17d8e449 - Release apertis-dev-tools version 0.2024.17

Compare with previous version

This tool needs to be listed in the variable TOOLS in tools/Makefile otherwise it won't be installed in the binary package

added 2 commits

• a088ceb9 - apertis-pkg-merge-local: Add new tool
• 1e68d5c4 - Release apertis-dev-tools version 0.2024.17

Compare with previous version

resolved all threads

merged