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

#52 More explicit placeholder text for search box #66

Merged
merged 3 commits into from
Apr 2, 2021

Conversation

pooja2299
Copy link
Contributor

Added my solution to issue #52.

@bryan-brancotte
Copy link
Member

Hi @pooja2299

Thanks for the PR, indeed the text you propose is better than what was initially there 🏅 . Note that adding an icon would also have been a good idea.

I can only recommend that now you grab another "good first issue".

Best wishes

Copy link
Member

@hmenager hmenager left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you so much @pooja2299! I just asked for two minor modifications to the code (see below)

@hmenager
Copy link
Member

hmenager commented Apr 1, 2021

@pooja2299 to resolve the conflict here, the easiest way would be to click on the "resolve conflict" button on this page. It should take you to a web editor where you can see the conflict as shown in the screenshot below:
image
The conflict is shown in lines 122 to 126, with your version being in line 123 and the current main version being in line 125.
Here, all you have to do is remove lines 122 and 124-126, to keep the version of the code in line 123.
Then, you can validate by clicking on the "Mark as resolved" button at the top right corner of this same page, and the conflict should be solved.

@pooja2299
Copy link
Contributor Author

Conflict resolved!:grin: Thanks @hmenager for such detailed guidance.

@matuskalas
Copy link
Member

Should we merge this now @bryan-brancotte & @hmenager ?

@hmenager hmenager removed the request for review from bryan-brancotte April 2, 2021 08:24
@hmenager
Copy link
Member

hmenager commented Apr 2, 2021

@bryan-brancotte will not be much available today, so since I discussed this PR yesterday with him, I won't request a formal review from him today :)

@hmenager hmenager merged commit e336bf7 into edamontology:main Apr 2, 2021
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.

4 participants