feat: add merge strategy option to merge command and UI (#1913) #3994

Job	Run time
Prepare version string	6s
Build / Build Windows ARM64	4m 7s
Build / Build macOS (Intel)	6m 13s
Build / Build Windows x64	3m 58s
Build / Build Linux	3m 20s
Build / Build Linux (arm64)	3m 18s
Build / Build macOS (Apple Silicon)	3m 11s
Package / Package Windows (win-arm64)	28s
Package / Package Windows (win-x64)	26s
Package / Package Linux (linux-arm64)	54s
Package / Package Linux (linux-x64)	55s
Package / Package macOS (osx-arm64)	17s
Package / Package macOS (osx-x64)	22s
	27m 35s

Provide feedback