To cherry-pick your last commit from the develop branch to your current branch, follow these steps:
# Fetch the latest changes
git fetch origin
# Show commits on the develop branch
git log origin/develop -n 10 --oneline
# Look for your last commit in the list and note its hash (like `a1b2c3d`).
# Make sure you're on the branch where you want to apply the commit
`git checkout your-current-branch`
# Cherry-pick the commit
`git cherry-pick a1b2c3d`
If you encounter conflicts:
After resolving conflicts in your editor
git add .
git cherry-pick --continue
Or if you want to abort
git cherry-pick --abort
git push origin your-current-branch