You can get merge conflicts in cherry picks too, it’s the same process.
you are viewing a single comment's thread
view the rest of the comments
view the rest of the comments
You can get merge conflicts in cherry picks too, it’s the same process.