Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added 'Actions (active)' option #22

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from

Conversation

hughc
Copy link

@hughc hughc commented Jun 19, 2016

New option shows only those hooks that are currently in use. Handy when modifying a 3rd party theme, where you want to find and modify existing elements.

Sample output

@christophercochran
Copy link
Owner

This looks great. Thanks for the commit! Going to look this over and get in merged in for the next release.

@christophercochran christophercochran changed the base branch from master to develop April 8, 2017 23:46
@GaryJones
Copy link

@hughc Could you please rebase your PR?

…urrently in use.

- updated reference to plugins folder to point to css at all times
- updated styles to make sure hook blocks appear over content that might otherwise obscure them
- updated for WordPress 4.7 WP_Hook class
@hughc
Copy link
Author

hughc commented Apr 10, 2017

@GaryJones, sorry to waste yr time, I'm not too git-savvy; I rebased my commits internally, and collapsed them all into one, but I'm now thinking I've got to re-add this repo as a remote and rebase against it, as it has changed?

@GaryJones
Copy link

Yes:

  • re-add this repo as upstream.
  • git fetch --all to fetch from all remotes.
  • git pull this develop branch into your own develop branch.
    • OR git checkout this develop branch into a new local develop branch if you haven't got it already.
  • branch your master into a new branch called action-hooks-active.
  • rebase action-hooks-active to it sits on top of your develop branch
    • Fix merge conflicts
  • push your action-hooks-active to your remote.
  • Open a new PR (as the branch name is different)
  • Close this PR.

That should solve the current issue, but your master branch will still be screwed. You should always do PRs from new branches.

  • Delete your local master branch
  • Checkout the upstream master.
  • Turn off any branch protection for master you might have added to your remote fork.
  • Force push your local master to your upstream. (If you don't force, it'll be rejected).
  • Re-enable any branch protection for master if you want.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants