fix(merge-config): save the pkg-name not the component-id in the conflict files#6822

Merged

davidfirst merged 2 commits intomasterfrom merge-config-pkg-name

Dec 21, 2022

+10-2

Commits on Dec 21, 2022

fix(merge-config): save the pkg-name not the component-id in the conflict files
davidfirst
committed
Merge branch 'master' into merge-config-pkg-name
davidfirst
authored