shishirb-MSFT
commented
2 years ago - Instead of cherry-picks that can cause conflicts later, or worse, ignored changes, created a patch branch from a common ancestor (git merge-base main develop) and cherry-picked changes onto this branch instead.
- This patch branch will then be merged to develop and main.