Git || Resolve cherry pick conflicts - mpaz-redstage/magento-snippets GitHub Wiki

git cherry-pick 5699da6725762c204de82af64fa01c4052b7d6d0

then you get some conflicts, steps to fix it

1. resolve the conflicts manually
2. git add all of the files that you fixed the conflicts
3. git cherry-pick --continue
4. am editor will be open to you change the commit message

all done :)