Skip to content

Commit

Permalink
Suggest git status
Browse files Browse the repository at this point in the history
  • Loading branch information
ellatrix committed Jun 26, 2024
1 parent 008adee commit 7b0a41f
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/cherry-pick-wp-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,11 @@ jobs:
git checkout -b my-branch
# Cherry-pick the commit.
git cherry-pick ${commitSha}
# Check which files have conflicts.
git status
# Resolve the conflict...
# Add the resolved files to the staging area.
git status
git add .
git cherry-pick --continue
# Push the branch to the repository
Expand Down

0 comments on commit 7b0a41f

Please sign in to comment.