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

Override icon with an image URL #772

Closed
wants to merge 0 commits into from
Closed

Override icon with an image URL #772

wants to merge 0 commits into from

Conversation

jampez77
Copy link
Contributor

added image attribute to override icon with a URL.

@jlsjonas
Copy link
Collaborator

Hey, apparently dev has been force pushed to; could you please rebase onto dev and add a screenshot of what your PR is trying to accomplish? Thanks!

@jampez77
Copy link
Contributor Author

Hi, I've rebased and it all appears fine from what I can see. Here is a screenshot of what I'm trying to acheive.
Screenshot 2022-05-12 at 14 20 55

@jlsjonas
Copy link
Collaborator

jlsjonas commented May 13, 2022

As the branches diverged, the easiest will probably be to reset your branch onto dev and apply your changes again (git reset --hard origin/dev)
Note that you will have to force push after committing (git push --force-with-lease)

Note that this is an exceptional circumstance, as master had somehow diverged from dev

@jampez77
Copy link
Contributor Author

As the branches diverged, the easiest will probably be to reset your branch onto dev and apply your changes again (git reset --hard origin/dev) Note that you will have to force push after committing (git push --force-with-lease)

Note that this is an exceptional circumstance, as master had somehow diverged from dev

Do i need to do this now? I was under the impression I had resolved the conflicts.

@jlsjonas
Copy link
Collaborator

jlsjonas commented May 13, 2022

@jampez77 yes, you're currently requesting to merge 34 commits instead of 1

@kalkih
Copy link
Owner

kalkih commented May 13, 2022

@jampez77 Tried to push to your dev branch to fix the history but didn't have permission, I've opened a new PR with your commits on, will fix the linting issues and merge it, thanks for your contribution.

See #789

@jampez77 jampez77 deleted the dev branch August 22, 2022 14:10
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